diff --git a/src/components/runners/RunnersOverview.svelte b/src/components/runners/RunnersOverview.svelte
index edbee415..0114221f 100644
--- a/src/components/runners/RunnersOverview.svelte
+++ b/src/components/runners/RunnersOverview.svelte
@@ -192,7 +192,11 @@
             {#each headerGroup.headers as header}
               <th class="cursor-pointer">
                 {#if !header.isPlaceholder}
-                  <div on:click={header.column.getToggleSortingHandler()}>
+                  <button
+                    role="button"
+                    tabindex="0"
+                    on:click={header.column.getToggleSortingHandler()}
+                  >
                     <svelte:component
                       this={flexRender(
                         header.column.columnDef.header,
@@ -204,7 +208,7 @@
                     {:else if header.column.getIsSorted().toString() == "desc"}
                       🔽
                     {/if}
-                  </div>
+                  </button>
                 {/if}
                 {#if header.column.getCanFilter()}
                   <div class="relative max-w-xs">
diff --git a/src/components/shared/tablefilters.js b/src/components/shared/tablefilters.js
index cbf2abdf..504237e1 100644
--- a/src/components/shared/tablefilters.js
+++ b/src/components/shared/tablefilters.js
@@ -3,13 +3,8 @@ export const groupFilter = (row, columnId, value) => {
     if (group.responseType === "RUNNERORGANIZATION") {
         return group.name.toLowerCase().includes(value.toLowerCase());
     } else if (value.includes(">")) {
-        value = value.split(">")[1];
-        if (value.length == 0) {
-            return group.name.toLowerCase().includes(value.toLowerCase());
-        }
         return (
-            group.name.toLowerCase().includes(value.toLowerCase()) ||
-            group.parentGroup.name.toLowerCase().includes(value.toLowerCase())
+            `${group.parentGroup.name} > ${group.name}`.toLowerCase().includes(value.toLowerCase())
         );
     } else {
         return (