diff --git a/src/components/runners/RunnersOverview.svelte b/src/components/runners/RunnersOverview.svelte
index c4f63bd4..087bacb4 100644
--- a/src/components/runners/RunnersOverview.svelte
+++ b/src/components/runners/RunnersOverview.svelte
@@ -152,13 +152,9 @@
           </thead>
           <tbody class="divide-y divide-gray-200">
             {#each current_runners as runner}
-              {#if runner.firstname
+              {#if `${runner.firstname} ${runner.lastname}`
                 .toLowerCase()
-                .includes(searchvalue.toLowerCase()) || runner.lastname
-                  .toLowerCase()
-                  .includes(searchvalue.toLowerCase()) || `${runner.firstname} ${runner.lastname}`
-                  .toLowerCase()
-                  .includes(searchvalue.toLowerCase()) || `${runner.firstname} ${runner.middlename || ""} ${runner.lastname}`
+                .includes(searchvalue.toLowerCase()) || `${runner.firstname} ${runner.middlename || ""} ${runner.lastname}`
                   .toLowerCase()
                   .includes(searchvalue.toLowerCase()) || searchvalue === `#${runner.id}`}
                 {#if filterGroupIDs.includes(runner.group.id) || filterGroupIDs.includes(runner.group.parentGroup?.id) || filterGroupIDs.length === 0}