diff --git a/src/nodes/jacdac-command/jacdac-command.html/editor.html b/src/nodes/jacdac-command/jacdac-command.html/editor.html
index b12178f..d76feaa 100644
--- a/src/nodes/jacdac-command/jacdac-command.html/editor.html
+++ b/src/nodes/jacdac-command/jacdac-command.html/editor.html
@@ -11,7 +11,7 @@
     </div>
     <div class="form-row">
         <label for="node-input-service"
-            ><i class="icon-tag"></i> Service code or name</label
+            ><i class="icon-tag"></i> Service code or id</label
         >
         <input type="text" id="node-input-service" placeholder="*" />
     </div>
diff --git a/src/nodes/jacdac-event/jacdac-event.html/editor.html b/src/nodes/jacdac-event/jacdac-event.html/editor.html
index dc81750..cfa7242 100644
--- a/src/nodes/jacdac-event/jacdac-event.html/editor.html
+++ b/src/nodes/jacdac-event/jacdac-event.html/editor.html
@@ -11,7 +11,7 @@
     </div>
     <div class="form-row">
         <label for="node-input-service"
-            ><i class="icon-tag"></i> Service code or name</label
+            ><i class="icon-tag"></i> Service code or id</label
         >
         <input type="text" id="node-input-service" placeholder="*" />
     </div>
diff --git a/src/nodes/jacdac-report/jacdac-report.html/editor.html b/src/nodes/jacdac-report/jacdac-report.html/editor.html
index cb8ac46..01de257 100644
--- a/src/nodes/jacdac-report/jacdac-report.html/editor.html
+++ b/src/nodes/jacdac-report/jacdac-report.html/editor.html
@@ -11,7 +11,7 @@
     </div>
     <div class="form-row">
         <label for="node-input-service"
-            ><i class="icon-tag"></i> Service code or name</label
+            ><i class="icon-tag"></i> Service code or id</label
         >
         <input type="text" id="node-input-service" placeholder="*" />
     </div>
diff --git a/src/nodes/shared/filters.ts b/src/nodes/shared/filters.ts
index 72cffb7..5010553 100644
--- a/src/nodes/shared/filters.ts
+++ b/src/nodes/shared/filters.ts
@@ -20,15 +20,16 @@ export function createDeviceFilter(options: JacdacDeviceFilterOptions) {
 export function createServiceFilter(options: JacdacServiceFilterOptions) {
     const { service, serviceIndex, serviceInstanceName } = options
 
+    const nservice = service
+        ? service.toLowerCase().replace(/\s/g, "")
+        : service
     const instanceNameRx = serviceInstanceName
         ? new RegExp(serviceInstanceName, "i")
         : undefined
     return (srv: JDService) =>
         (!service ||
             srv.serviceClass === parseInt(service, 16) ||
-            (srv.name &&
-                srv.name.toLocaleLowerCase() ===
-                    service.toLocaleLowerCase())) &&
+            (srv.specification && srv.specification.shortId === nservice)) &&
         (serviceIndex === undefined || serviceIndex == srv.serviceIndex) &&
         (!instanceNameRx || instanceNameRx.test(srv.instanceName))
 }