diff --git a/op-mode-definitions/show-interfaces-bonding.xml.in b/op-mode-definitions/show-interfaces-bonding.xml.in
index 6908153dd..c41e7bd5f 100644
--- a/op-mode-definitions/show-interfaces-bonding.xml.in
+++ b/op-mode-definitions/show-interfaces-bonding.xml.in
@@ -1,83 +1,83 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
     <children>
       <node name="interfaces">
         <children>
           <tagNode name="bonding">
             <properties>
               <help>Show specified Bonding interface information</help>
               <completionHelp>
                 <path>interfaces bonding</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4" --intf_type=bonding</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified bonding interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4" --intf_type=bonding</command>
               </leafNode>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed interface information</help>
                 </properties>
                 <command>if [ -f "/proc/net/bonding/$4" ]; then cat "/proc/net/bonding/$4"; else echo "Interface $4 does not exist!"; fi</command>
               </leafNode>
               <leafNode name="slaves">
                 <properties>
                   <help>Show specified bonding interface information</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/show-bond.py --interface "$4"</command>
               </leafNode>
               <tagNode name="vif">
                 <properties>
                   <help>Show specified virtual network interface (vif) information</help>
                   <completionHelp>
                     <path>interfaces bonding ${COMP_WORDS[3]} vif</path>
                   </completionHelp>
                 </properties>
-                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4.$6"</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4.$6" --intf_type=bonding</command>
                 <children>
                   <leafNode name="brief">
                     <properties>
                       <help>Show summary of specified virtual network interface (vif) information</help>
                     </properties>
-                    <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4.$6"</command>
+                    <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4.$6" --intf_type=bonding</command>
                   </leafNode>
                 </children>
               </tagNode>
               <leafNode name="xdp">
                 <properties>
                   <help>Show eXpress Data Path statistics</help>
                 </properties>
                 <command>sudo ${vyos_op_scripts_dir}/show_xdp_stats.sh bonding "$4"</command>
               </leafNode>
             </children>
           </tagNode>
           <node name="bonding">
             <properties>
               <help>Show Bonding interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=bonding</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed bonding interface information</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=bonding</command>
               </leafNode>
               <leafNode name="slaves">
                 <properties>
                   <help>Show specified bonding interface information</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/show-bond.py --slaves</command>
               </leafNode>
             </children>
           </node>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/show-interfaces-bridge.xml.in b/op-mode-definitions/show-interfaces-bridge.xml.in
index b950c3a17..22cd3ee67 100644
--- a/op-mode-definitions/show-interfaces-bridge.xml.in
+++ b/op-mode-definitions/show-interfaces-bridge.xml.in
@@ -1,42 +1,42 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
     <children>
       <node name="interfaces">
         <children>
           <tagNode name="bridge">
             <properties>
               <help>Show specified Bridge interface information</help>
               <completionHelp>
                 <path>interfaces bridge</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4" --intf_type=bridge</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified bridge interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4" --intf_type=bridge</command>
               </leafNode>
             </children>
           </tagNode>
           <node name="bridge">
             <properties>
               <help>Show Bridge interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=bridge</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed bridge interface information</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=bridge</command>
               </leafNode>
             </children>
           </node>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/show-interfaces-dummy.xml.in b/op-mode-definitions/show-interfaces-dummy.xml.in
index 398e00636..958d3483d 100644
--- a/op-mode-definitions/show-interfaces-dummy.xml.in
+++ b/op-mode-definitions/show-interfaces-dummy.xml.in
@@ -1,42 +1,42 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
     <children>
       <node name="interfaces">
         <children>
           <tagNode name="dummy">
             <properties>
               <help>Show specified Dummy interface information</help>
               <completionHelp>
                 <path>interfaces dummy</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4" --intf_type=dummy</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified dummy interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4" --intf_type=dummy</command>
               </leafNode>
             </children>
           </tagNode>
           <node name="dummy">
             <properties>
               <help>Show Dummy interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=dummy</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed dummy interface information</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=dummy</command>
               </leafNode>
             </children>
           </node>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/show-interfaces-ethernet.xml.in b/op-mode-definitions/show-interfaces-ethernet.xml.in
index 40d4adbb2..81759c2b6 100644
--- a/op-mode-definitions/show-interfaces-ethernet.xml.in
+++ b/op-mode-definitions/show-interfaces-ethernet.xml.in
@@ -1,97 +1,97 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
     <children>
       <node name="interfaces">
         <children>
           <tagNode name="ethernet">
             <properties>
               <help>Show specified Ethernet interface information</help>
               <completionHelp>
                 <path>interfaces ethernet</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4" --intf_type=ethernet</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified ethernet interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4" --intf_type=ethernet</command>
               </leafNode>
               <leafNode name="identify">
                 <properties>
                   <help>Visually identify specified ethernet interface</help>
                 </properties>
                 <command>echo "Blinking interface $4 for 30 seconds."; ethtool --identify "$4" 30</command>
               </leafNode>
               <node name="physical">
                 <properties>
                   <help>Show physical device information for specified ethernet interface</help>
                 </properties>
                 <command>ethtool "$4"; ethtool --show-ring "$4"; ethtool --driver "$4"</command>
                 <children>
                   <leafNode name="offload">
                     <properties>
                       <help>Show physical device offloading capabilities</help>
                     </properties>
                     <command>ethtool --show-features "$4" | sed -e 1d -e '/fixed/d' -e 's/^\t*//g' -e 's/://' | column -t -s' '</command>
                   </leafNode>
                 </children>
               </node>
               <leafNode name="statistics">
                 <properties>
                   <help>Show physical device statistics for specified ethernet interface</help>
                 </properties>
                 <command>ethtool --statistics "$4"</command>
               </leafNode>
               <leafNode name="transceiver">
                 <properties>
                   <help>Show transceiver information from modules (e.g SFP+, QSFP)</help>
                 </properties>
                 <command>ethtool --module-info "$4"</command>
               </leafNode>
               <tagNode name="vif">
                 <properties>
                   <help>Show specified virtual network interface (vif) information</help>
                   <completionHelp>
                     <path>interfaces ethernet ${COMP_WORDS[3]} vif</path>
                   </completionHelp>
                 </properties>
-                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4.$6"</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4.$6" --intf_type=ethernet</command>
                 <children>
                   <leafNode name="brief">
                     <properties>
                       <help>Show summary of specified virtual network interface (vif) information</help>
                     </properties>
-                    <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4.$6"</command>
+                    <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4.$6" --intf_type=ethernet</command>
                   </leafNode>
                 </children>
               </tagNode>
               <leafNode name="xdp">
                 <properties>
                   <help>Show eXpress Data Path statistics</help>
                 </properties>
                 <command>sudo ${vyos_op_scripts_dir}/show_xdp_stats.sh ethernet "$4"</command>
               </leafNode>
             </children>
           </tagNode>
           <node name="ethernet">
             <properties>
               <help>Show Ethernet interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=ethernet</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed ethernet interface information</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=ethernet</command>
               </leafNode>
             </children>
           </node>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/show-interfaces-geneve.xml.in b/op-mode-definitions/show-interfaces-geneve.xml.in
index be3084af3..3cf45878d 100644
--- a/op-mode-definitions/show-interfaces-geneve.xml.in
+++ b/op-mode-definitions/show-interfaces-geneve.xml.in
@@ -1,42 +1,42 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
     <children>
       <node name="interfaces">
         <children>
           <tagNode name="geneve">
             <properties>
               <help>Show specified GENEVE interface information</help>
               <completionHelp>
                 <path>interfaces geneve</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4" --intf_type=geneve</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified GENEVE interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4" --intf_type=geneve</command>
               </leafNode>
             </children>
           </tagNode>
           <node name="geneve">
             <properties>
               <help>Show GENEVE interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=geneve</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed GENEVE interface information</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=geneve</command>
               </leafNode>
             </children>
           </node>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/show-interfaces-input.xml.in b/op-mode-definitions/show-interfaces-input.xml.in
index 1f8505160..5d93dcee6 100644
--- a/op-mode-definitions/show-interfaces-input.xml.in
+++ b/op-mode-definitions/show-interfaces-input.xml.in
@@ -1,42 +1,42 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
     <children>
       <node name="interfaces">
         <children>
           <tagNode name="input">
             <properties>
               <help>Show specified Input interface information</help>
               <completionHelp>
                 <path>interfaces input</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4" --intf_type=input</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified input interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4" --intf_type=input</command>
               </leafNode>
             </children>
           </tagNode>
           <node name="input">
             <properties>
               <help>Show Input (ifb) interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=input</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed input interface information</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=input</command>
               </leafNode>
             </children>
           </node>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/show-interfaces-l2tpv3.xml.in b/op-mode-definitions/show-interfaces-l2tpv3.xml.in
index ff08b8266..713e36dac 100644
--- a/op-mode-definitions/show-interfaces-l2tpv3.xml.in
+++ b/op-mode-definitions/show-interfaces-l2tpv3.xml.in
@@ -1,42 +1,42 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
     <children>
       <node name="interfaces">
         <children>
           <tagNode name="l2tpv3">
             <properties>
               <help>Show specified L2TPv3 interface information</help>
               <completionHelp>
                 <path>interfaces l2tpv3</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4" --intf_type=l2tpv3</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified L2TPv3 interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4" --intf_type=l2tpv3</command>
               </leafNode>
             </children>
           </tagNode>
           <node name="l2tpv3">
             <properties>
               <help>Show L2TPv3 interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=l2tpv3</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed L2TPv3 interface information</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=l2tpv3</command>
               </leafNode>
             </children>
           </node>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/show-interfaces-loopback.xml.in b/op-mode-definitions/show-interfaces-loopback.xml.in
index 9919bf32b..a24151cc3 100644
--- a/op-mode-definitions/show-interfaces-loopback.xml.in
+++ b/op-mode-definitions/show-interfaces-loopback.xml.in
@@ -1,42 +1,42 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
     <children>
       <node name="interfaces">
         <children>
           <tagNode name="loopback">
             <properties>
               <help>Show specified Loopback interface information</help>
               <completionHelp>
                 <path>interfaces loopback</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4" --intf_type=loopback</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified Loopback interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4" --intf_type=loopback</command>
               </leafNode>
             </children>
           </tagNode>
           <node name="loopback">
             <properties>
               <help>Show Loopback interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=loopback</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed Loopback interface information</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=loopback</command>
               </leafNode>
             </children>
           </node>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/show-interfaces-pppoe.xml.in b/op-mode-definitions/show-interfaces-pppoe.xml.in
index 80bfd00ff..a34473148 100644
--- a/op-mode-definitions/show-interfaces-pppoe.xml.in
+++ b/op-mode-definitions/show-interfaces-pppoe.xml.in
@@ -1,51 +1,51 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
     <children>
       <node name="interfaces">
         <children>
           <tagNode name="pppoe">
             <properties>
               <help>Show specified PPPoE interface information</help>
               <completionHelp>
                 <path>interfaces pppoe</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4" --intf_type=pppoe</command>
             <children>
               <leafNode name="log">
                 <properties>
                   <help>Show specified PPPoE interface log</help>
                 </properties>
                 <command>journalctl --no-hostname --boot --follow --unit "ppp@$4".service</command>
               </leafNode>
               <leafNode name="statistics">
                 <properties>
                   <help>Show specified PPPoE interface statistics</help>
                   <completionHelp>
                     <path>interfaces pppoe</path>
                   </completionHelp>
                 </properties>
                 <command>if [ -d "/sys/class/net/$4" ]; then /usr/sbin/pppstats "$4"; fi</command>
               </leafNode>
             </children>
           </tagNode>
           <node name="pppoe">
             <properties>
               <help>Show PPPoE interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=pppoe</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed PPPoE interface information</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=pppoe</command>
               </leafNode>
             </children>
           </node>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/show-interfaces-pseudo-ethernet.xml.in b/op-mode-definitions/show-interfaces-pseudo-ethernet.xml.in
index 0c00dbdd0..cb62639ee 100644
--- a/op-mode-definitions/show-interfaces-pseudo-ethernet.xml.in
+++ b/op-mode-definitions/show-interfaces-pseudo-ethernet.xml.in
@@ -1,42 +1,42 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
     <children>
       <node name="interfaces">
         <children>
           <tagNode name="pseudo-ethernet">
             <properties>
               <help>Show specified Pseudo-Ethernet/MACvlan interface information</help>
               <completionHelp>
                 <path>interfaces pseudo-ethernet</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4" --intf_type=pseudo-ethernet</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified pseudo-ethernet/MACvlan interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4" --intf_type=pseudo-ethernet</command>
               </leafNode>
             </children>
           </tagNode>
           <node name="pseudo-ethernet">
             <properties>
               <help>Show Pseudo-Ethernet/MACvlan interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=pseudo-ethernet</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed pseudo-ethernet/MACvlan interface information</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=pseudo-ethernet</command>
               </leafNode>
             </children>
           </node>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/show-interfaces-sstpc.xml.in b/op-mode-definitions/show-interfaces-sstpc.xml.in
index c473f9822..a619a9fd2 100644
--- a/op-mode-definitions/show-interfaces-sstpc.xml.in
+++ b/op-mode-definitions/show-interfaces-sstpc.xml.in
@@ -1,51 +1,51 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
     <children>
       <node name="interfaces">
         <children>
           <tagNode name="sstpc">
             <properties>
               <help>Show specified SSTP client interface information</help>
               <completionHelp>
                 <path>interfaces sstpc</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4" --intf_type=sstpc</command>
             <children>
               <leafNode name="log">
                 <properties>
                   <help>Show specified SSTP client interface log</help>
                 </properties>
                 <command>journalctl --no-hostname --boot --follow --unit "ppp@$4".service</command>
               </leafNode>
               <leafNode name="statistics">
                 <properties>
                   <help>Show specified SSTP client interface statistics</help>
                   <completionHelp>
                     <path>interfaces sstpc</path>
                   </completionHelp>
                 </properties>
                 <command>if [ -d "/sys/class/net/$4" ]; then /usr/sbin/pppstats "$4"; fi</command>
               </leafNode>
             </children>
           </tagNode>
           <node name="sstpc">
             <properties>
               <help>Show SSTP client interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=sstpc</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed SSTP client interface information</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=sstpc</command>
               </leafNode>
             </children>
           </node>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/show-interfaces-tunnel.xml.in b/op-mode-definitions/show-interfaces-tunnel.xml.in
index 4af90b813..10e10e655 100644
--- a/op-mode-definitions/show-interfaces-tunnel.xml.in
+++ b/op-mode-definitions/show-interfaces-tunnel.xml.in
@@ -1,42 +1,42 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
     <children>
       <node name="interfaces">
         <children>
           <tagNode name="tunnel">
             <properties>
               <help>Show specified Tunnel interface information</help>
               <completionHelp>
                 <path>interfaces tunnel</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4" --intf_type=tunnel</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified tunnel interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4" --intf_type=tunnel</command>
               </leafNode>
             </children>
           </tagNode>
           <node name="tunnel">
             <properties>
               <help>Show Tunnel interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=tunnel</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed tunnel interface information</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=tunnel</command>
               </leafNode>
             </children>
           </node>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/show-interfaces-virtual-ethernet.xml.in b/op-mode-definitions/show-interfaces-virtual-ethernet.xml.in
index 2aa71c687..c743492fb 100644
--- a/op-mode-definitions/show-interfaces-virtual-ethernet.xml.in
+++ b/op-mode-definitions/show-interfaces-virtual-ethernet.xml.in
@@ -1,42 +1,42 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
     <children>
       <node name="interfaces">
         <children>
           <tagNode name="virtual-ethernet">
             <properties>
               <help>Show specified virtual-ethernet interface information</help>
               <completionHelp>
                 <path>interfaces virtual-ethernet</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4" --intf_type=virtual-ethernet</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified virtual-ethernet interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4" --intf_type=virtual-ethernet</command>
               </leafNode>
             </children>
           </tagNode>
           <node name="virtual-ethernet">
             <properties>
               <help>Show virtual-ethernet interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=virtual-ethernet</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed virtual-ethernet interface information</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=virtual-ethernet</command>
               </leafNode>
             </children>
           </node>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/show-interfaces-vti.xml.in b/op-mode-definitions/show-interfaces-vti.xml.in
index 195e1d5da..d532894b7 100644
--- a/op-mode-definitions/show-interfaces-vti.xml.in
+++ b/op-mode-definitions/show-interfaces-vti.xml.in
@@ -1,42 +1,42 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
     <children>
       <node name="interfaces">
         <children>
           <tagNode name="vti">
             <properties>
               <help>Show specified VTI interface information</help>
               <completionHelp>
                 <path>interfaces vti</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4" --intf_type=vti</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified vti interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4" --intf_type=vti</command>
               </leafNode>
             </children>
           </tagNode>
           <node name="vti">
             <properties>
               <help>Show VTI interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=vti</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed vti interface information</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=vti</command>
               </leafNode>
             </children>
           </node>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/show-interfaces-vxlan.xml.in b/op-mode-definitions/show-interfaces-vxlan.xml.in
index a1d01a6af..fde832551 100644
--- a/op-mode-definitions/show-interfaces-vxlan.xml.in
+++ b/op-mode-definitions/show-interfaces-vxlan.xml.in
@@ -1,42 +1,42 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
     <children>
       <node name="interfaces">
         <children>
           <tagNode name="vxlan">
             <properties>
               <help>Show specified VXLAN interface information</help>
               <completionHelp>
                 <path>interfaces vxlan</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4" --intf_type=vxlan</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified VXLAN interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4" --intf_type=vxlan</command>
               </leafNode>
             </children>
           </tagNode>
           <node name="vxlan">
             <properties>
               <help>Show VXLAN interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=vxlan</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed VXLAN interface information</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=vxlan</command>
               </leafNode>
             </children>
           </node>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/show-interfaces-wireguard.xml.in b/op-mode-definitions/show-interfaces-wireguard.xml.in
index 55879cfff..eba8de568 100644
--- a/op-mode-definitions/show-interfaces-wireguard.xml.in
+++ b/op-mode-definitions/show-interfaces-wireguard.xml.in
@@ -1,66 +1,66 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
     <children>
       <node name="interfaces">
         <children>
           <tagNode name="wireguard">
             <properties>
               <help>Show specified WireGuard interface information</help>
               <completionHelp>
                 <script>${vyos_completion_dir}/list_interfaces.py --type wireguard</script>
               </completionHelp>
             </properties>
-	        <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
+	        <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4" --intf_type=wireguard</command>
             <children>
               <leafNode name="allowed-ips">
                 <properties>
                   <help>Show all IP addresses allowed for the specified interface</help>
                 </properties>
                 <command>sudo wg show "$4" allowed-ips</command>
               </leafNode>
               <leafNode name="endpoints">
                 <properties>
                   <help>Show all endpoints for the specified interface</help>
                 </properties>
                 <command>sudo wg show "$4" endpoints</command>
               </leafNode>
               <leafNode name="peers">
                 <properties>
                   <help>Show all peer IDs for the specified interface</help>
                 </properties>
                 <command>sudo wg show "$4" peers</command>
               </leafNode>
               <leafNode name="public-key">
                 <properties>
                   <help>Show interface public-key</help>
                 </properties>
                 <command>sudo wg show "$4" public-key</command>
               </leafNode>
               <leafNode name="summary">
                 <properties>
                   <help>Shows current configuration and device information</help>
                 </properties>
                 <command>sudo wg show "$4"</command>
               </leafNode>
             </children>
           </tagNode>
           <node name="wireguard">
             <properties>
               <help>Show WireGuard interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=wireguard</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed Wireguard interface information</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=wireguard</command>
               </leafNode>
             </children>
           </node>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/show-interfaces-wireless.xml.in b/op-mode-definitions/show-interfaces-wireless.xml.in
index 7ae2c8ce4..b0a272225 100644
--- a/op-mode-definitions/show-interfaces-wireless.xml.in
+++ b/op-mode-definitions/show-interfaces-wireless.xml.in
@@ -1,82 +1,82 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
     <children>
       <node name="interfaces">
         <children>
           <node name="wireless">
             <properties>
               <help>Show Wireless (WLAN) interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=wireless</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed wireless interface information</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=wireless</command>
               </leafNode>
               <leafNode name="info">
                 <properties>
                   <help>Show wireless interface configuration</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/show_wireless.py --brief</command>
               </leafNode>
             </children>
           </node>
           <tagNode name="wireless">
             <properties>
               <help>Show specified wireless interface information</help>
               <completionHelp>
                 <script>${vyos_completion_dir}/list_interfaces.py --type wireless</script>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4" --intf_type=wireless</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified wireless interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4" --intf_type=wireless</command>
               </leafNode>
               <node name="scan">
                 <properties>
                   <help>Show summary of the specified wireless interface information</help>
                 </properties>
                 <command>sudo ${vyos_op_scripts_dir}/show_wireless.py --scan "$4"</command>
                 <children>
                   <leafNode name="detail">
                     <properties>
                       <help>Show detailed scan results</help>
                     </properties>
                     <command>sudo /sbin/iw dev "$4" scan ap-force</command>
                   </leafNode>
                 </children>
               </node>
               <leafNode name="stations">
                 <properties>
                   <help>Show specified Wireless interface information</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/show_wireless.py --stations "$4"</command>
               </leafNode>
               <tagNode name="vif">
                 <properties>
                   <help>Show specified virtual network interface (vif) information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4.$6"</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4.$6" --intf_type=wireless</command>
                 <children>
                   <leafNode name="brief">
                     <properties>
                       <help>Show summary of specified virtual network interface (vif) information</help>
                     </properties>
-                    <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4.$6"</command>
+                    <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4.$6" --intf_type=wireless</command>
                   </leafNode>
                 </children>
               </tagNode>
             </children>
           </tagNode>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/show-interfaces-wwan.xml.in b/op-mode-definitions/show-interfaces-wwan.xml.in
index 8ac5933a2..17d4111a9 100644
--- a/op-mode-definitions/show-interfaces-wwan.xml.in
+++ b/op-mode-definitions/show-interfaces-wwan.xml.in
@@ -1,103 +1,103 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
     <children>
       <node name="interfaces">
         <children>
           <tagNode name="wwan">
             <properties>
               <help>Show specified Wireless Wire Area Network (WWAN) interface information</help>
               <completionHelp>
                 <path>interfaces wwan</path>
                 <script>cd /sys/class/net; ls -d wwan*</script>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4" --intf_type=wirelessmodem</command>
             <children>
               <leafNode name="capabilities">
                 <properties>
                   <help>Show WWAN module capabilities</help>
                 </properties>
                 <command>sudo ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --capabilities</command>
               </leafNode>
               <leafNode name="firmware">
                 <properties>
                   <help>Show WWAN module firmware</help>
                 </properties>
                 <command>sudo ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --firmware</command>
               </leafNode>
               <leafNode name="imei">
                 <properties>
                   <help>Show WWAN module IMEI/ESN/MEID</help>
                 </properties>
                 <command>sudo ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --imei</command>
               </leafNode>
               <leafNode name="imsi">
                 <properties>
                   <help>Show WWAN module IMSI</help>
                 </properties>
                 <command>sudo ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --imsi</command>
               </leafNode>
               <leafNode name="model">
                 <properties>
                   <help>Show WWAN module manufacturer</help>
                 </properties>
                 <command>sudo ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --model</command>
               </leafNode>
               <leafNode name="msisdn">
                 <properties>
                   <help>Show WWAN module MSISDN</help>
                 </properties>
                 <command>sudo ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --msisdn</command>
               </leafNode>
               <leafNode name="revision">
                 <properties>
                   <help>Show WWAN module revision</help>
                 </properties>
                 <command>sudo ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --revision</command>
               </leafNode>
               <leafNode name="signal">
                 <properties>
                   <help>Show WWAN module RF signal info</help>
                 </properties>
                 <command>sudo ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --signal</command>
               </leafNode>
               <leafNode name="sim">
                 <properties>
                   <help>Show WWAN module connected SIM card information</help>
                 </properties>
                 <command>sudo ${vyos_op_scripts_dir}/show_wwan.py --interface=$4 --sim</command>
               </leafNode>
               <leafNode name="detail">
                 <properties>
                   <help>Show WWAN module detailed information summary</help>
                 </properties>
                 <command>mmcli --modem ${4#wwan}</command>
               </leafNode>
               <leafNode name="log">
                 <properties>
                   <help>Show interface log for specified interface</help>
                 </properties>
                 <command>echo not implemented</command>
               </leafNode>
             </children>
           </tagNode>
           <node name="wwan">
             <properties>
               <help>Show Wireless Modem (WWAN) interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=wirelessmodem</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed Wireless Modem (WWAN( interface information</help>
                 </properties>
                 <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=wirelessmodem</command>
               </leafNode>
             </children>
           </node>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>