diff --git a/src/components/RunnersOverview.svelte b/src/components/RunnersOverview.svelte
index 39f0cdad..9ff8b3c7 100644
--- a/src/components/RunnersOverview.svelte
+++ b/src/components/RunnersOverview.svelte
@@ -30,6 +30,12 @@
   RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => {
     orgs = val;
   });
+  function should_display_based_on_id(id) {
+    if(searchvalue.toString().slice(-1)==="*"){
+      return id.toString().startsWith(searchvalue.replace("*",""))
+    }
+    return id.toString()===searchvalue;
+  }
 </script>
 
 {#if store.state.jwtinfo.userdetails.permissions.includes('RUNNER:GET')}
@@ -88,10 +94,7 @@
           </thead>
           <tbody class="divide-y divide-gray-200">
             {#each current_runners as runner}
-              {#if Object.values(runner)
-                .toString()
-                .toLowerCase()
-                .includes(searchvalue)}
+              {#if runner.firstname.toLowerCase().includes(searchvalue.toLowerCase())||runner.middlename.toLowerCase().includes(searchvalue.toLowerCase())||runner.lastname.toLowerCase().includes(searchvalue.toLowerCase())||should_display_based_on_id(runner.id)}
                 {#if filterGroupIDs.includes(runner.group.id)||filterGroupIDs.includes(runner.group.parentGroup?.id)||filterGroupIDs.length===0}
                 <tr data-rowid="user_{runner.id}" data-groupid={runner.group.id}>
                   <td class="px-6 py-4 whitespace-nowrap">