diff --git a/Netdisco/views/inc/device/ports.tt b/Netdisco/views/inc/device/ports.tt
index 7ea7793c..601a0257 100644
--- a/Netdisco/views/inc/device/ports.tt
+++ b/Netdisco/views/inc/device/ports.tt
@@ -1,7 +1,8 @@
 
           <form id="[% tab.id %]_form" class="nd_sidesearchform form-stacked" method="get" action="/device">
-            <input name="ip" value="[% d.ip %]" type="hidden"/>
             <input name="tab" value="[% tab.id %]" type="hidden"/>
+            <input name="ip" value="[% params.ip %]" type="hidden"/>
+            <input name="port" value="[% params.port %]" type="hidden"/>
             <div class="nd_search clearfix">
               <button id="[% tab.id %]_submit" type="submit" class="btn info">Update View</button>
               <a id="[% tab.id %]_bookmark" href="#"
diff --git a/Netdisco/views/inc/search/device.tt b/Netdisco/views/inc/search/device.tt
index a40137e6..329c08c4 100644
--- a/Netdisco/views/inc/search/device.tt
+++ b/Netdisco/views/inc/search/device.tt
@@ -2,32 +2,32 @@
             <p><em>Device Search Options</em></p>
             <div class="clearfix">
               <input class="span3" placeholder="System Name"
-                type="text" id="name" name="name" value="[% params.name %]"
+                type="text" name="name" value="[% params.name %]"
                 rel="twipsy" data-placement="right" data-offset="5" title="System Name"/>
             </div>
             <div class="clearfix">
               <input class="span3" placeholder="Location"
-                type="text" id="location" name="location" value="[% params.location %]"
+                type="text" name="location" value="[% params.location %]"
                 rel="twipsy" data-placement="right" data-offset="5" title="Location"/>
             </div>
             <div class="clearfix">
               <input class="span3" placeholder="DNS"
-                type="text" id="dns" name="dns" value="[% params.dns %]"
+                type="text" name="dns" value="[% params.dns %]"
                 rel="twipsy" data-placement="right" data-offset="5" title="DNS"/>
             </div>
             <div class="clearfix">
               <input class="span3" placeholder="IP Address"
-                type="text" id="ip" name="ip" value="[% params.ip %]"
+                type="text" name="ip" value="[% params.ip %]"
                 rel="twipsy" data-placement="right" data-offset="5" title="IP Address"/>
             </div>
             <div class="clearfix">
               <input class="span3" placeholder="Description"
-                type="text" id="description" name="description" value="[% params.description %]"
+                type="text" name="description" value="[% params.description %]"
                 rel="twipsy" data-placement="right" data-offset="5" title="Description"/>
             </div>
             <div class="clearfix">
               <select class="span3" size="[% vars.model_list.size > 5 ? 5 : vars.model_list.size %]"
-                multiple="on" id="model" name="model"
+                multiple="on" name="model"
                 rel="twipsy" data-placement="right" data-offset="5" title="Model"/>
                 [% FOREACH opt IN vars.model_list %]
                 <option[% ' selected="selected"' IF vars.model_lkp.exists(opt) %]>[% opt %]</option>
@@ -36,7 +36,7 @@
             </div>
             <div class="clearfix">
               <select class="span3" size="[% vars.os_ver_list.size > 5 ? 5 : vars.os_ver_list.size %]"
-                multiple="on" id="os_ver" name="os_ver"
+                multiple="on" name="os_ver"
                 rel="twipsy" data-placement="right" data-offset="5" title="OS Release"/>
                 [% FOREACH opt IN vars.os_ver_list %]
                 <option[% ' selected="selected"' IF vars.os_ver_lkp.exists(opt) %]>[% opt %]</option>
@@ -45,7 +45,7 @@
             </div>
             <div class="clearfix">
               <select class="span3" size="[% vars.vendor_list.size > 5 ? 5 : vars.vendor_list.size %]"
-                multiple="on" id="vendor" name="vendor"
+                multiple="on" name="vendor"
                 rel="twipsy" data-placement="right" data-offset="5" title="Vendor"/>
                 [% FOREACH opt IN vars.vendor_list %]
                 <option[% ' selected="selected"' IF vars.vendor_lkp.exists(opt) %]>[% opt %]</option>