diff --git a/Netdisco/share/views/ajax/device/ports.tt b/Netdisco/share/views/ajax/device/ports.tt
index 6c9534c4..c2a7fe02 100644
--- a/Netdisco/share/views/ajax/device/ports.tt
+++ b/Netdisco/share/views/ajax/device/ports.tt
@@ -303,8 +303,8 @@
           [% END %]
           [% IF params.n_netbios %]
             [% FOREACH nbt IN node.netbios %]
-            <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;\\<a href="[% uri_for('/report/netbios') %]?domain=[% nbt.domain | uri %]" title="Nodes in this Domain">[% nbt.domain | html %]</a>\<a href="[% search_node %]&q=[% nbt.nbname | uri %]">[% nbt.nbname | html_entity %]</a>
-            <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[% nbt.nbuser || '[No User]' | html %]@<a href="[% search_node %]&q=[% nbt.ip | uri %]">[% nbt.ip | html_entity %]</a>
+            <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;\\<a href="[% uri_for('/report/netbios') %]?domain=[% nbt.domain | uri %]" title="Nodes in this Domain">[% nbt.domain | html_entity %]</a>\<a href="[% search_node %]&q=[% nbt.nbname | uri %]">[% nbt.nbname | html_entity %]</a>
+            <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[% nbt.nbuser || '[No User]' | html_entity %]@<a href="[% search_node %]&q=[% nbt.ip | uri %]">[% nbt.ip | html_entity %]</a>
             [% END %]
           [% END %]
         [% END %]
diff --git a/Netdisco/share/views/ajax/report/moduleinventory.tt b/Netdisco/share/views/ajax/report/moduleinventory.tt
index dbbda590..c904c2c7 100644
--- a/Netdisco/share/views/ajax/report/moduleinventory.tt
+++ b/Netdisco/share/views/ajax/report/moduleinventory.tt
@@ -27,32 +27,32 @@
         <td>
           <a class="nd_linkcell"
              href="[% uri_for('/report/moduleinventory') %]?description=[% row.description | uri %]">
-            [% row.description | html %]</a>
+            [% row.description | html_entity %]</a>
         </td>
         <td>
           <a class="nd_linkcell"
              href="[% uri_for('/report/moduleinventory') %]?name=[% row.name | uri %]">
-            [% row.name | html %]</a>
+            [% row.name | html_entity %]</a>
         </td>
         <td>
           <a class="nd_linkcell"
              href="[% uri_for('/report/moduleinventory') %]?class=[% row.class | uri %]">
-            [% row.class.ucfirst | html %]</a>
+            [% row.class.ucfirst | html_entity %]</a>
         </td>
         <td>
           <a class="nd_linkcell"
              href="[% uri_for('/report/moduleinventory') %]?type=[% row.type | uri %]">
-            [% row.type | html %]</a>
+            [% row.type | html_entity %]</a>
         </td>
         <td>
           <a class="nd_linkcell"
              href="[% uri_for('/report/moduleinventory') %]?model=[% row.model | uri %]">
-            [% row.model | html %]</a>
+            [% row.model | html_entity %]</a>
         </td>
         <td>
           <a class="nd_linkcell"
              href="[% uri_for('/report/moduleinventory') %]?serial=[% row.serial | uri %]">
-            [% row.serial | html %]</a>
+            [% row.serial | html_entity %]</a>
         </td>
         <td>[% row.hw_ver | html_entity %]</td>
         <td>[% row.sw_ver | html_entity %]</td>
@@ -76,7 +76,7 @@
         <td>
           <a class="nd_linkcell"
              href="[% uri_for('/report/moduleinventory') %]?class=[% row.class | uri %]">
-            [% row.class.ucfirst | html %]</a>
+            [% row.class.ucfirst | html_entity %]</a>
         </td>
         <td>[% row.count | format_number %]</td>
       </tr>
diff --git a/Netdisco/share/views/ajax/report/netbios.tt b/Netdisco/share/views/ajax/report/netbios.tt
index e8965e7e..dfefeb65 100644
--- a/Netdisco/share/views/ajax/report/netbios.tt
+++ b/Netdisco/share/views/ajax/report/netbios.tt
@@ -18,8 +18,8 @@
       <tr>
         <td>[% row.domain | html_entity %]</td>
         <td><a href="[% search_node %]&q=[% row.mac | uri %]">[% row.mac.upper | html_entity %]</td>
-        <td>[% IF row.domain %]\\[% row.domain | html %]\[% END %]<a href="[% search_node %]&q=[% row.nbname | uri %]">[% row.nbname | html_entity %]</a></td>
-        <td>[% row.nbuser || '[No User]' | html %]@<a href="[% search_node %]&q=[% row.ip | uri %]">[% row.ip | html_entity %]</a></td>
+        <td>[% IF row.domain %]\\[% row.domain | html_entity %]\[% END %]<a href="[% search_node %]&q=[% row.nbname | uri %]">[% row.nbname | html_entity %]</a></td>
+        <td>[% row.nbuser || '[No User]' | html_entity %]@<a href="[% search_node %]&q=[% row.ip | uri %]">[% row.ip | html_entity %]</a></td>
         <td>[% date.format(row.time_first) | html_entity %]</td>
         <td>[% date.format(row.time_last) | html_entity %]</td>
       </tr>
@@ -38,7 +38,7 @@
     </tbody>  
     [% WHILE (row = results.next) %]
       <tr>
-        <td class="nd_linkcell"><a href="[% uri_for('/report/netbios') %]?domain=[% row.domain || 'blank' | uri %]">[% row.domain || '(Blank Domain)' | html %]</a></td>
+        <td class="nd_linkcell"><a href="[% uri_for('/report/netbios') %]?domain=[% row.domain || 'blank' | uri %]">[% row.domain || '(Blank Domain)' | html_entity %]</a></td>
         <td>[% row.count | format_number %]</td>
       </tr>
     [% END %]
diff --git a/Netdisco/share/views/ajax/report/portssid.tt b/Netdisco/share/views/ajax/report/portssid.tt
index 7a07d3c9..266bc195 100644
--- a/Netdisco/share/views/ajax/report/portssid.tt
+++ b/Netdisco/share/views/ajax/report/portssid.tt
@@ -43,7 +43,7 @@
         <td>
           <a class="nd_linkcell"
              href="[% uri_for('/report/portssid') %]?ssid=[% row.ssid | uri %]">
-            [% row.ssid | html %]</a>
+            [% row.ssid | html_entity %]</a>
         </td>
         <td class="nd_center-cell">[% row.broadcast ? 'Yes' : 'No' %]</td>
         <td class="nd_center-cell">[% row.count | format_number %]</td>
diff --git a/Netdisco/share/views/ajax/search/node_by_ip.tt b/Netdisco/share/views/ajax/search/node_by_ip.tt
index ebc2a234..074a6556 100644
--- a/Netdisco/share/views/ajax/search/node_by_ip.tt
+++ b/Netdisco/share/views/ajax/search/node_by_ip.tt
@@ -26,8 +26,8 @@
       <td>[% row.oui.company | html_entity %]</td>
       [% END %]
       <td>NetBIOS</td>
-      <td class="nd_linkcell">\\<a href="[% uri_for('/report/netbios') %]?domain=[% row.domain | uri %]" title="Devices in this Domain">[% row.domain | html %]</a>\<a href="[% search_node %]&q=[% row.nbname | uri %]">[% row.nbname | html_entity %]</a>
-        <br>[% row.nbuser || '[No User]' | html %]@<a href="[% search_node %]&q=[% row.ip | uri %]">[% row.ip | html_entity %]</a>
+      <td class="nd_linkcell">\\<a href="[% uri_for('/report/netbios') %]?domain=[% row.domain | uri %]" title="Devices in this Domain">[% row.domain | html_entity %]</a>\<a href="[% search_node %]&q=[% row.nbname | uri %]">[% row.nbname | html_entity %]</a>
+        <br>[% row.nbuser || '[No User]' | html_entity %]@<a href="[% search_node %]&q=[% row.ip | uri %]">[% row.ip | html_entity %]</a>
       </td>
       [% IF params.stamps %]
       <td>[% row.time_first_stamp | html_entity %]</td>
@@ -60,8 +60,8 @@
       <td>&nbsp;</td>
       [% END %]
       <td>NetBIOS</td>
-      <td class="nd_linkcell">\\<a href="[% uri_for('/report/netbios') %]?domain=[% nbt.domain | uri %]" title="Devices in this Domain">[% nbt.domain | html %]</a>\<a href="[% search_node %]&q=[% nbt.nbname | uri %]">[% nbt.nbname | html_entity %]</a>
-        <br>[% nbt.nbuser || '[No User]' | html %]@<a href="[% search_node %]&q=[% nbt.ip | uri %]">[% nbt.ip | html_entity %]</a>
+      <td class="nd_linkcell">\\<a href="[% uri_for('/report/netbios') %]?domain=[% nbt.domain | uri %]" title="Devices in this Domain">[% nbt.domain | html_entity %]</a>\<a href="[% search_node %]&q=[% nbt.nbname | uri %]">[% nbt.nbname | html_entity %]</a>
+        <br>[% nbt.nbuser || '[No User]' | html_entity %]@<a href="[% search_node %]&q=[% nbt.ip | uri %]">[% nbt.ip | html_entity %]</a>
       </td>
       [% IF params.stamps %]
       <td>[% date.format(nbt.time_first) | html_entity %]</td>
diff --git a/Netdisco/share/views/ajax/search/node_by_mac.tt b/Netdisco/share/views/ajax/search/node_by_mac.tt
index 7043b869..7921de86 100644
--- a/Netdisco/share/views/ajax/search/node_by_mac.tt
+++ b/Netdisco/share/views/ajax/search/node_by_mac.tt
@@ -134,8 +134,8 @@
       </td>
       [% END %]
       <td>NetBIOS</td>
-      <td class="nd_linkcell">\\<a href="[% uri_for('/report/netbios') %]?domain=[% nbt.domain | uri %]" title="Devices in this Domain">[% nbt.domain | html %]</a>\<a href="[% search_node %]&q=[% nbt.nbname | uri %]">[% nbt.nbname | html_entity %]</a>
-        <br>[% nbt.nbuser || '[No User]' | html %]@<a href="[% search_node %]&q=[% nbt.ip | uri %]">[% nbt.ip | html_entity %]</a>
+      <td class="nd_linkcell">\\<a href="[% uri_for('/report/netbios') %]?domain=[% nbt.domain | uri %]" title="Devices in this Domain">[% nbt.domain | html_entity %]</a>\<a href="[% search_node %]&q=[% nbt.nbname | uri %]">[% nbt.nbname | html_entity %]</a>
+        <br>[% nbt.nbuser || '[No User]' | html_entity %]@<a href="[% search_node %]&q=[% nbt.ip | uri %]">[% nbt.ip | html_entity %]</a>
       </td>
       [% IF params.stamps %]
       <td>[% nbt.time_first_stamp | html_entity %]</td>