diff --git a/Build.PL b/Build.PL
index c26a34e8..e581f67d 100644
--- a/Build.PL
+++ b/Build.PL
@@ -64,6 +64,7 @@ Module::Build->new(
     'Sereal' => '0',
     'Socket6' => '0.23',
     'Starman' => '0.4008',
+    'Storable' => 0,
     'SNMP::Info' => '3.38',
     'SQL::Translator' => '0.11018',
     'Template' => '2.24',
diff --git a/lib/App/Netdisco/Web/Device.pm b/lib/App/Netdisco/Web/Device.pm
index 4314af46..e80c8ddb 100644
--- a/lib/App/Netdisco/Web/Device.pm
+++ b/lib/App/Netdisco/Web/Device.pm
@@ -62,8 +62,6 @@ hook 'before' => sub {
   return unless (request->path eq uri_for('/device')->path
     or index(request->path, uri_for('/ajax/content/device')->path) == 0);
 
-  # force always setting params manually
-  params->{'firstsearch'} = 'on';
 # TODO set cookie
 #  if (param('reset') or not param('tab') or param('tab') ne 'ports') {
 };
diff --git a/share/views/layouts/main.tt b/share/views/layouts/main.tt
index ccfb06c5..2bd2ac13 100644
--- a/share/views/layouts/main.tt
+++ b/share/views/layouts/main.tt
@@ -86,7 +86,7 @@
               <ul class="dropdown-menu">
               [% FOREACH item IN settings._reports_menu.$category %]
                 [% NEXT IF settings._reports.$item.hidden %]
-                <li><a href="[% uri_for('/report/' _ item) %]?firstsearch=on">[% settings._reports.$item.label | html_entity %]</a></li>
+                <li><a href="[% uri_for('/report/' _ item) %]">[% settings._reports.$item.label | html_entity %]</a></li>
               [% END %]
               </ul>
             </li>
@@ -138,7 +138,6 @@
       <form class="navbar-search pull-left" method="get" action="[% uri_for('/search') %]">
         <input placeholder="Find Anything" class="search-query span3"
           id="nq" name="q" value="[% display_name %]" type="text" autocomplete="off"/>
-        <input name="firstsearch" type="hidden" value="on">
         <div class="btn-group nd_navbar-search-group">
           <button class="btn btn-inverse nd_navbar-search-icon">
             <span style="font-size: 18px;">