diff --git a/Netdisco/share/views/ajax/device/addresses.tt b/Netdisco/share/views/ajax/device/addresses.tt
index 36231a3c..4eb5c3ea 100644
--- a/Netdisco/share/views/ajax/device/addresses.tt
+++ b/Netdisco/share/views/ajax/device/addresses.tt
@@ -17,7 +17,7 @@
         href="[% device_ports %]&q=[% params.q | uri %]&f=[% row.port | uri %]">[% row.port | html_entity %]</a></td>
       <td>[% row.device_port.name | html_entity %]</td>
       <td><a class="nd_linkcell"
-        href="[% search_device %]&ip=[% row.subnet | uri %]">[% row.subnet | html_entity %]</a></td>
+        href="[% search_device %]&q=[% row.subnet | uri %]&ip=[% row.subnet | uri %]">[% row.subnet | html_entity %]</a></td>
     </tr>
     [% END %]
   </tbody>
diff --git a/Netdisco/share/views/ajax/device/details.tt b/Netdisco/share/views/ajax/device/details.tt
index 0d52e979..21c3cfde 100644
--- a/Netdisco/share/views/ajax/device/details.tt
+++ b/Netdisco/share/views/ajax/device/details.tt
@@ -19,7 +19,7 @@
       [% ELSE %]
       <td>
         <a rel="tooltip" data-placement="top" data-offset="5" data-title="Find Similar Devices"
-        href="[% search_device %]&location=[% d.location | uri %]">[% d.location | html_entity %]</a>
+        href="[% search_device %]&q=[% d.location | uri %]&location=[% d.location | uri %]">[% d.location | html_entity %]</a>
       </td>
       [% END %]
     </tr>
@@ -42,10 +42,10 @@
       <td>Vendor / Model</td>
       <td>
         <a rel="tooltip" data-placement="top" data-offset="5" data-title="Find Similar Devices"
-        href="[% search_device %]&vendor=[% d.vendor | uri %]">[% d.vendor | html_entity %]</a>
+        href="[% search_device %]&q=[% d.vendor | uri %]&vendor=[% d.vendor | uri %]">[% d.vendor | html_entity %]</a>
         /
         <a rel="tooltip" data-placement="top" data-offset="5" data-title="Find Similar Devices"
-        href="[% search_device %]&model=[% d.model | uri %]">[% d.model | html_entity %]</a>
+        href="[% search_device %]&q=[% d.model | uri %]&model=[% d.model | uri %]">[% d.model | html_entity %]</a>
       </td>
     </tr>
     <tr>
@@ -53,7 +53,7 @@
       <td>[% d.os | html_entity %] /
         <a rel="tooltip" data-placement="top" data-offset="5"
           data-title="Find Similar Devices"
-          href="[% search_device %]&os_ver=[% d.os_ver | uri %]">[% d.os_ver | html_entity %]</a>
+          href="[% search_device %]&q=[% d.os_ver | uri %]&os_ver=[% d.os_ver | uri %]">[% d.os_ver | html_entity %]</a>
       </td>
     </tr>
     <tr>
diff --git a/Netdisco/share/views/inventory.tt b/Netdisco/share/views/inventory.tt
index df7fa2c1..47cc0484 100644
--- a/Netdisco/share/views/inventory.tt
+++ b/Netdisco/share/views/inventory.tt
@@ -17,12 +17,12 @@
           <tr>
             <th>
               <a class="nd_linkcell"
-                href="[% search_device %]&vendor=[% platform.vendor | uri %]">
+                href="[% search_device %]&q=[% platform.vendor | uri %]&vendor=[% platform.vendor | uri %]">
                   [% platform.vendor | html_entity %]</a>
             </th>
             <th>
               <a class="nd_linkcell"
-                href="[% search_device %]&model=[% platform.model | uri %]">
+                href="[% search_device %]&q=[% platform.model | uri %]&model=[% platform.model | uri %]">
                   [% platform.model | html_entity %]</a>
             </th>
             <th>[% platform.get_column('count') | html_entity %]</th>
@@ -48,7 +48,7 @@
             <th>[% release.os | html_entity %]</th>
             <th>
               <a class="nd_linkcell"
-                href="[% search_device %]&os_ver=[% release.os_ver | uri %]">
+                href="[% search_device %]&q=[% release.os_ver | uri %]&os_ver=[% release.os_ver | uri %]">
                   [% release.os_ver | html_entity %]</a>
             </th>
             <th>[% release.get_column('count') | html_entity %]</th>