diff --git a/share/views/ajax/device/snmp.tt b/share/views/ajax/device/snmp.tt
index c6a2516c..2662e897 100644
--- a/share/views/ajax/device/snmp.tt
+++ b/share/views/ajax/device/snmp.tt
@@ -29,23 +29,23 @@
                   <td></td>
                 </tr>
                 <tr>
-                  <th scope="row">Type</th>
-                  <td></td>
-                </tr>
-                <tr>
-                  <th scope="row">Unpacker</th>
+                  <th scope="row">Status</th>
                   <td></td>
                 </tr>
                 <tr>
                   <th scope="row">Access</th>
                   <td></td>
                 </tr>
+                <tr>
+                  <th scope="row">Type</th>
+                  <td></td>
+                </tr>
                 <tr>
                   <th scope="row">Index</th>
                   <td></td>
                 </tr>
                 <tr>
-                  <th scope="row">Status</th>
+                  <th scope="row">Filter</th>
                   <td></td>
                 </tr>
                 <tr>
diff --git a/share/views/ajax/device/snmpnode.tt b/share/views/ajax/device/snmpnode.tt
index dc8ed79e..ab5e4ee9 100644
--- a/share/views/ajax/device/snmpnode.tt
+++ b/share/views/ajax/device/snmpnode.tt
@@ -13,26 +13,17 @@
       <td>[% node.snmp_object.leaf | html_entity %]</td>
     </tr>
     <tr>
-      <th scope="row">Type</th>
-      <td>[% node.snmp_object.type | html_entity %]</td>
-    </tr>
-    <tr>
-      <th scope="row">Unpacker</th>
-      <td>
-      [% IF node.value %]
-      <select name="munger" id="munger">
-        [% UNLESS munge %]<option value="" selected disabled hidden>None applied</option>[% END %]
-        [% FOREACH m IN mungers %]
-        <option [% 'selected' IF m == munge %] value="[% m | uri %]">[% m | html_entity %]</option>
-        [% END %]
-      </select>
-      [% END %]
-      </td>
+      <th scope="row">Status</th>
+      <td>[% node.snmp_object.status | html_entity %]</td>
     </tr>
     <tr>
       <th scope="row">Access</th>
       <td>[% node.snmp_object.access | html_entity %]</td>
     </tr>
+    <tr>
+      <th scope="row">Type</th>
+      <td>[% node.snmp_object.type | html_entity %]</td>
+    </tr>
     <tr>
       <th scope="row">Index</th>
       <td>
@@ -46,8 +37,17 @@
       </td>
     </tr>
     <tr>
-      <th scope="row">Status</th>
-      <td>[% node.snmp_object.status | html_entity %]</td>
+      <th scope="row">Filter</th>
+      <td>
+      [% IF node.value %]
+      <select name="munger" id="munger">
+        [% UNLESS munge %]<option value="" selected disabled hidden>None applied</option>[% END %]
+        [% FOREACH m IN mungers %]
+        <option [% 'selected' IF m == munge %] value="[% m | uri %]">[% m | html_entity %]</option>
+        [% END %]
+      </select>
+      [% END %]
+      </td>
     </tr>
     <tr>
       <th scope="row">Enum Syntax</th>