diff --git a/Netdisco/share/public/javascripts/netdisco.js b/Netdisco/share/public/javascripts/netdisco.js
index ad3d8188..8427d5dd 100644
--- a/Netdisco/share/public/javascripts/netdisco.js
+++ b/Netdisco/share/public/javascripts/netdisco.js
@@ -290,6 +290,17 @@ $(document).ready(function() {
     ,separator: ' to '
   }
   ,function(start, end) {
-      $('#daterange').parent('.clearfix').addClass('success');
+    $('#daterange').trigger('input');
   });
+
+  // handler for datepicker in node sidebar
+  $('.nd_sidebar').on('input', '#daterange', function() {
+    if ($(this).prop('value') == '') {
+      $('#daterange').parent('.clearfix').removeClass('success');
+    }
+    else {
+      $('#daterange').parent('.clearfix').addClass('success');
+    }
+  });
+  $('#daterange').trigger('input');
 });
diff --git a/Netdisco/share/views/js/search.js b/Netdisco/share/views/js/search.js
index 3583649a..9dcd1681 100644
--- a/Netdisco/share/views/js/search.js
+++ b/Netdisco/share/views/js/search.js
@@ -21,13 +21,6 @@
     form_inputs.each(function() {device_form_state($(this))});
     form_inputs.change(function() {device_form_state($(this))});
 
-    // special case for datepicker in node sidebar
-    $('.nd_sidebar').on('input', '#daterange', function() {
-      if ($(this).prop('value') == '') {
-        $('#daterange').parent('.clearfix').removeClass('success');
-      }
-    });
-
     // handler for copy icon in search option
     $('.nd_field-copy-icon').click(function() {
       var name = $(this).data('btn-for');
diff --git a/Netdisco/share/views/sidebar/report/ipinventory.tt b/Netdisco/share/views/sidebar/report/ipinventory.tt
index 39b068e6..6cd903e0 100644
--- a/Netdisco/share/views/sidebar/report/ipinventory.tt
+++ b/Netdisco/share/views/sidebar/report/ipinventory.tt
@@ -8,27 +8,18 @@
 
             <fieldset>
               <legend class="nd_sidebar-legend">
-                <label class="checkbox">
-                  <input type="checkbox" id="age_on" name="age_on"
-                    [% 'checked="checked"' UNLESS (params.exists('age_on') AND params.age_on == '') %]/>
-                  <em><strong>Age Filter</strong></em>
-                </label>
+                <label><em><strong>Date Range</strong></em></label>
               </legend>
+              <div class="clearfix input-prepend">
+                <label class="add-on">
+                  <input type="checkbox" id="age_invert"
+                    name="age_invert"[% ' checked="checked"' IF params.age_invert %]/>
+                </label>
+                <label class="nd_checkboxlabel" for="age_invert">
+                  <span class="nd_searchcheckbox uneditable-input">Not within...</span>
+                </label>
+              </div>
               <div class="clearfix">
-                <ul class="unstyled">
-                  <li>
-                    <div class="clearfix input-prepend">
-                      <label class="add-on">
-                      <input type="checkbox" id="age_invert"
-                        name="age_invert"[% ' checked="checked"' IF params.age_invert %]/>
-                      </label>
-                      <label class="nd_checkboxlabel" for="age_invert">
-                        <span class="nd_searchcheckbox uneditable-input">Not</span>
-                      </label>
-                    </div>
-                  </li>
-                </ul>
-                <em class="muted">Seen within the date range:</em><br/>
                 <input class="nd_side-input" id="daterange"
                   type="text" name="daterange" value="[% params.daterange | html_entity %]"/>
               </div>