diff --git a/src/klish-plugin-infix/xml/infix.xml b/src/klish-plugin-infix/xml/infix.xml
index c1d69da8..f80f41ec 100644
--- a/src/klish-plugin-infix/xml/infix.xml
+++ b/src/klish-plugin-infix/xml/infix.xml
@@ -251,14 +251,12 @@
           </COMMAND>
         </SWITCH>
         <ACTION sym="script" in="tty" out="tty" interrupt="true">
-          sysrepocfg -d operational -X -f json -x /ietf-interfaces:interfaces | \
-          /usr/libexec/statd/cli-pretty show-bridge-mdb |pager
+          show --raw interface | /usr/libexec/statd/cli-pretty show-bridge-mdb |pager
         </ACTION>
       </COMMAND>
       <COMMAND name="stp" help="Show spanning tree status">
         <ACTION sym="script" in="tty" out="tty" interrupt="true">
-          sysrepocfg -d operational -X -f json -x /ietf-interfaces:interfaces | \
-          /usr/libexec/statd/cli-pretty show-bridge-stp |pager
+          show --raw interface | /usr/libexec/statd/cli-pretty show-bridge-stp |pager
         </ACTION>
       </COMMAND>
       <COMMAND name="vlan" help="Show VLAN table">
@@ -292,8 +290,7 @@
 
   <COMMAND name="ntp" help="Show NTP (client) status">
     <ACTION sym="script">
-      sysrepocfg -d operational -X -f json -x /system-state/ntp  | \
-         /usr/libexec/statd/cli-pretty "show-ntp"
+      show ntp
     </ACTION>
     <SWITCH name="optional" min="0">
       <COMMAND name="tracking" help="Show NTP tracking">
@@ -325,15 +322,7 @@
       </COMMAND>
     </SWITCH>
     <ACTION sym="script">
-      tmp=$(mktemp)
-      sysrepocfg -d operational -X -f json -x /ietf-system:system-state/infix-system:software | \
-              jq -r '.[][].slot |= sort_by(.name)' > "$tmp"
-      if [ -n "$KLISH_PARAM_name" ]; then
-          cat "$tmp" | /usr/libexec/statd/cli-pretty "show-software" -n "$KLISH_PARAM_name"
-      else
-          cat "$tmp" | /usr/libexec/statd/cli-pretty "show-software"
-      fi
-      rm "$tmp"
+      show software "$KLISH_PARAM_name"
     </ACTION>
   </COMMAND>
 
@@ -386,8 +375,7 @@
 
   <COMMAND name="hardware" help="Show hardware information">
     <ACTION sym="script" in="tty" out="tty" interrupt="true">
-      sysrepocfg -f json -X -d operational -x "/ietf-hardware:hardware" | \
-      /usr/libexec/statd/cli-pretty "show-hardware" |pager
+      show hardware |pager
     </ACTION>
   </COMMAND>
 
@@ -400,14 +388,7 @@
       </COMMAND>
     </SWITCH>
     <ACTION sym="script" in="tty" out="tty" interrupt="true">
-      if [ -n "$KLISH_PARAM_name" ]; then
-        doas sysrepocfg -f json -X -d operational -x \
-          "/ietf-interfaces:interfaces/interface[name=\"$KLISH_PARAM_name\"]" | \
-          /usr/libexec/statd/cli-pretty "show-interfaces" -n "$KLISH_PARAM_name" |pager
-      else
-        doas sysrepocfg -f json -X -d operational -m ietf-interfaces | \
-          /usr/libexec/statd/cli-pretty "show-interfaces" |pager
-      fi
+        show interface "$KLISH_PARAM_name" |pager
     </ACTION>
   </COMMAND>
 
diff --git a/src/show/show.py b/src/show/show.py
index 5e5d6161..6416a7ef 100755
--- a/src/show/show.py
+++ b/src/show/show.py
@@ -99,7 +99,7 @@ def interface(args: List[str]) -> None:
         print(json.dumps(data, indent=2))
         return
 
-    if len(args) == 0:
+    if len(args) == 0 or not args[0]:  # Treat "" as no arg.
         cli_pretty(data, "show-interfaces")
     elif len(args) == 1:
         iface = args[0]
@@ -130,10 +130,8 @@ def software(args: List[str]) -> None:
     if RAW_OUTPUT:
         print(json.dumps(data, indent=2))
         return
-
-    if len(args) == 0:
+    if len(args) == 0 or not args[0]:  # Treat "" as no arg.
         cli_pretty(data, "show-software")
-        print(".....")
     elif len(args) == 1:
         name = args[0]
         if name not in ("primary", "secondary"):
diff --git a/src/statd/python/cli_pretty/cli_pretty.py b/src/statd/python/cli_pretty/cli_pretty.py
index fa32d528..85f04961 100755
--- a/src/statd/python/cli_pretty/cli_pretty.py
+++ b/src/statd/python/cli_pretty/cli_pretty.py
@@ -1193,7 +1193,7 @@ def show_software(json, name):
                f"{'VERSION':<{PadSoftware.version}}"
                f"{'DATE':<{PadSoftware.date}}")
         print(Decore.invert(hdr))
-        for _s in slots:
+        for _s in reversed(slots):
             slot = Software(_s)
             if slot.is_rootfs():
                 slot.print()