diff --git a/src/components/RunnersOverview.svelte b/src/components/RunnersOverview.svelte
index 79962d74..e73d901d 100644
--- a/src/components/RunnersOverview.svelte
+++ b/src/components/RunnersOverview.svelte
@@ -16,6 +16,7 @@
   $: filter__teams = selectedFilter_teams||[];
   $: filter__orgs = selectedFilter_orgs||[];
   $:filterGroupIDs=filter__teams.concat(filter__orgs).map(i=>i.value)
+  $: allteams = [];
   $: teams = [];
   $: orgs = [];
   $:selectgroups=orgs.map(function(g){
@@ -25,14 +26,26 @@
     return {value:g.id,label:g.name}
   })
   RunnerTeamService.runnerTeamControllerGetAll().then((val) => {
-    teams = val;
-  });
-  RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => {
-    orgs = val;
+    allteams = val;
+    RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => {
+      orgs = val;
+      teams = allteams;
+      const org_ids=orgs.map(o=>o.id)
+      for (const i of org_ids) {
+        teams=teams.filter(t=>t.parentGroup.id!==i)
+      }
+    });
   });
 </script>
 
+<hr>
+<h4>DEBUG</h4>
 {JSON.stringify(filterGroupIDs)}
+<hr>
+{JSON.stringify(teams)}
+<hr>
+{JSON.stringify(orgs)}
+<hr>
 {#if store.state.jwtinfo.userdetails.permissions.includes('RUNNER:GET')}
   {#await runners_promise}
     <div
@@ -54,14 +67,22 @@
       <div class="block mb-1">
         <label for="country" class="text-sm font-medium text-gray-700">Filter by Organization</label>
         <Select on:select={(event)=>{
-          console.log(event.detail);
+          console.log("change!");
           selectedFilter_orgs=event.detail
-                  }} selectedValue={selectedFilter_orgs} placeholder={$_('datatable.search')} containerClasses="mt-1 py-2 px-3 border border-gray-300 bg-white rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" items={selectgroups} isMulti={true}></Select>
+          selectedFilter_teams=null;
+          teams = allteams;
+          console.log(teams);
+          const org_ids=orgs.map(o=>o.id)
+          console.log(org_ids);
+          for (const i of org_ids) {
+            teams=teams.filter(t=>t.parentGroup.id!==i)
+          }
+          console.log(teams);
+                  }} selectedValue={selectedFilter_orgs} placeholder="Filter by Organization" containerClasses="mt-1 py-2 px-3 border border-gray-300 bg-white rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" items={selectgroups} isMulti={true}></Select>
         <label for="country" class="text-sm font-medium text-gray-700">Filter by Team</label>
         <Select on:select={(event)=>{
-console.log(event.detail);
 selectedFilter_teams=event.detail
-        }} selectedValue={selectedFilter_teams} placeholder={$_('datatable.search')} containerClasses="mt-1 py-2 px-3 border border-gray-300 bg-white rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" items={selectteams} isMulti={true}></Select>
+        }} selectedValue={selectedFilter_teams} placeholder="Filter by Team" containerClasses="mt-1 py-2 px-3 border border-gray-300 bg-white rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" items={selectteams} isMulti={true}></Select>
       </div>
       <div
         class="shadow border-b border-gray-200 sm:rounded-lg overflow-x-scroll">