diff --git a/components/probe/ProbeFilters/AdminFilterSettings.vue b/components/probe/ProbeFilters/AdminFilterSettings.vue
new file mode 100644
index 00000000..131f25bc
--- /dev/null
+++ b/components/probe/ProbeFilters/AdminFilterSettings.vue
@@ -0,0 +1,30 @@
+<template>
+	<div class="flex flex-col gap-2">
+		<span class="flex items-center font-bold">Adoption status:</span>
+		<Select
+			v-model="usedFilter.adoption"
+			:options="ADOPTION_OPTIONS"
+			class="min-w-48"
+			@change="onChange"
+		>
+			<template #value="{value}">
+				{{ value[0].toUpperCase() + value.slice(1) }}
+			</template>
+			<template #option="{option}">
+				{{ option[0].toUpperCase() + option.slice(1) }}
+			</template>
+		</Select>
+	</div>
+</template>
+
+<script setup lang="ts">
+	import { useProbeFilters, ADOPTION_OPTIONS, type Filter } from '~/composables/useProbeFilters';
+
+	const filter = defineModel('filter', { required: false, type: Object as PropType<Filter> });
+
+	const { filter: appliedFilter, onParamChange } = useProbeFilters();
+	const usedFilter = computed(() => filter.value ?? appliedFilter.value);
+
+	// only apply changes if the default (shared) filter is used
+	const onChange = filter.value ? () => {} : onParamChange;
+</script>
diff --git a/components/FilterSettings.vue b/components/probe/ProbeFilters/MobileProbeListFilters.vue
similarity index 61%
rename from components/FilterSettings.vue
rename to components/probe/ProbeFilters/MobileProbeListFilters.vue
index 81f5c5ee..64d8ac5f 100644
--- a/components/FilterSettings.vue
+++ b/components/probe/ProbeFilters/MobileProbeListFilters.vue
@@ -41,7 +41,7 @@
 			<span class="flex items-center font-bold">Filter:</span>
 			<IconField class="h-9 !w-full">
 				<InputIcon class="pi pi-search"/>
-				<InputText v-model="draftFilter.search" class="m-0 size-full" placeholder="Filter by name, location, or tags"/>
+				<InputText v-model="searchInput" class="m-0 size-full" placeholder="Filter by name, location, or tags" @value-change="onFilterChangeDebounced"/>
 			</IconField>
 		</InputGroup>
 
@@ -85,33 +85,33 @@
 			</div>
 		</div>
 
+		<AdminFilterSettings v-if="auth.isAdmin" v-model:filter="draftFilter"/>
+
 		<div class="mt-4 flex justify-end gap-2">
 			<Button label="Cancel" severity="secondary" text @click="emit('cancel')"/>
-			<Button label="Apply" @click="emit('apply', draftFilter)"/>
+			<Button label="Apply" @click="onBatchChange(draftFilter); emit('apply')"/>
 		</div>
 	</div>
 </template>
 
 <script setup lang="ts">
-	import {
-		type StatusCode,
-		type Filter,
-		SORTABLE_FIELDS,
-		STATUS_MAP,
-	} from '~/composables/useProbeFilters';
-
-	const { filter, statusCounts } = defineProps({
-		filter: {
-			required: true,
-			type: Object as PropType<Filter>,
-		},
-		statusCounts: {
-			required: true,
-			type: Object as PropType<Record<StatusCode, number>>,
-		},
-	});
+	import { aggregate } from '@directus/sdk';
+	import debounce from 'lodash/debounce';
+	import AdminFilterSettings from '~/components/probe/ProbeFilters/AdminFilterSettings.vue';
+	import { useErrorToast } from '~/composables/useErrorToast';
+	import { type StatusCode, SORTABLE_FIELDS, STATUS_MAP, useProbeFilters } from '~/composables/useProbeFilters';
+	import { useAuth } from '~/store/auth';
+
+	const auth = useAuth();
+	const { $directus } = useNuxtApp();
+
+	const { filter, getDirectusFilter, onBatchChange } = useProbeFilters();
+
+	const draftFilter = ref({ ...filter.value });
+	const draftFilterDeps = computed(() => ({ ...draftFilter.value }));
 
-	const draftFilter = ref({ ...filter });
+	const searchInput = ref(draftFilter.value.search);
+	const onFilterChangeDebounced = debounce(() => draftFilter.value.search = searchInput.value, 300);
 
 	const STATUS_CODES = Object.keys(STATUS_MAP) as StatusCode[];
 
@@ -121,8 +121,36 @@
 		tags: 'Tag count',
 	};
 
+	const { data: statusCounts, error: statusCountError } = await useLazyAsyncData(
+		() => $directus.request<[{ count: number; status: Status; isOutdated: boolean }]>(aggregate('gp_probes', {
+			query: {
+				filter: getDirectusFilter(draftFilter, [ 'status' ]),
+				groupBy: [ 'status', 'isOutdated' ],
+			},
+			aggregate: { count: '*' },
+		})),
+		{
+			watch: [ draftFilterDeps ],
+			default: () => Object.fromEntries(STATUS_CODES.map(status => [ status, 0 ])),
+			transform: (data) => {
+				const counts = Object.fromEntries(STATUS_CODES.map(status => [ status, 0 ]));
+
+				STATUS_CODES.forEach((code) => {
+					counts[code] = data.reduce((sum, status) => {
+						return STATUS_MAP[code].options.includes(status.status) && (status.isOutdated || !STATUS_MAP[code].outdatedOnly)
+							? sum + status.count
+							: sum;
+					}, 0);
+				});
+
+				return counts;
+			},
+		},
+	);
+
+	useErrorToast(statusCountError);
+
 	const emit = defineEmits<{
-		(e: 'cancel'): void;
-		(e: 'apply', payload: Filter): void;
+		(e: 'cancel' | 'apply'): void;
 	}>();
 </script>
diff --git a/components/probe/ProbeFilters/ProbeListFilters.vue b/components/probe/ProbeFilters/ProbeListFilters.vue
new file mode 100644
index 00000000..a5bdb833
--- /dev/null
+++ b/components/probe/ProbeFilters/ProbeListFilters.vue
@@ -0,0 +1,120 @@
+<template>
+	<div class="ml-auto flex h-9 items-stretch gap-x-2 self-end font-normal">
+		<span class="flex items-center font-bold">Status:</span>
+		<Select
+			v-model="filter.status"
+			:options="STATUS_CODES"
+			:pt="{ listContainer: { class: '!max-h-64' } }"
+			option-label="code"
+			class="min-w-64"
+			@change="onParamChange"
+		>
+			<template #option="{option}: {option: StatusCode}">
+				<span class="flex h-full items-center gap-2">
+					<span
+						:class="{
+							'font-bold text-bluegray-900 dark:text-white': option === filter.status,
+							'text-bluegray-400': option !== filter.status
+						}">
+						{{ STATUS_MAP[option].name }}
+					</span>
+					<Tag
+						class="-my-0.5"
+						:class="{
+							'bg-primary text-white dark:bg-white dark:text-bluegray-900 ': option === filter.status,
+							'border border-surface-300 bg-surface-0 text-bluegray-900 dark:border-dark-600 dark:bg-dark-800 dark:text-surface-0': option !== filter.status
+						}">
+						{{ statusCounts[option] }}
+					</Tag>
+				</span>
+			</template>
+
+			<template #value="{value}: {value: StatusCode}">
+				<span class="flex h-full items-center gap-2">
+					<span class="text-bluegray-400">{{ STATUS_MAP[value].name }}</span>
+					<Tag class="-my-1 border ">{{ statusCounts[value] }}</Tag>
+				</span>
+			</template>
+		</Select>
+		<InputGroup class="!w-auto">
+			<IconField>
+				<InputIcon class="pi pi-search"/>
+				<InputText v-model="searchInput" class="m-0 h-full min-w-[280px]" placeholder="Filter by name, location, or tags" @input="onFilterChangeDebounced"/>
+			</IconField>
+		</InputGroup>
+
+		<div v-if="auth.isAdmin" class="flex size-9 items-stretch justify-between rounded-md border border-surface-300 text-bluegray-700 focus-within:border-primary hover:border-surface-400 dark:border-dark-600 dark:bg-dark-900 dark:text-dark-0 dark:hover:border-dark-400">
+			<Button
+				class="relative hover:bg-white focus:ring-primary dark:hover:bg-dark-900 dark:focus:ring-primary"
+				severity="secondary"
+				size="small"
+				text
+				@click="adminOptsRef.toggle($event)">
+				<i class="pi pi-sliders-h"/>
+				<i v-if="!isDefault('adoption')" class="pi pi-circle-fill absolute right-2 top-2 text-[0.4rem] text-primary"/>
+			</Button>
+
+			<Popover ref="adminOptsRef" class="w-fit gap-4 p-4 [&>*]:border-none" role="dialog">
+				<AdminFilterSettings/>
+			</Popover>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+	import { aggregate } from '@directus/sdk';
+	import debounce from 'lodash/debounce';
+	import AdminFilterSettings from '~/components/probe/ProbeFilters/AdminFilterSettings.vue';
+	import { useErrorToast } from '~/composables/useErrorToast';
+	import { STATUS_MAP, type StatusCode, useProbeFilters } from '~/composables/useProbeFilters';
+	import { useAuth } from '~/store/auth';
+
+	const auth = useAuth();
+	const { $directus } = useNuxtApp();
+
+	const active = ref(true);
+	const { filter, onParamChange, onFilterChange, getDirectusFilter, isDefault } = useProbeFilters({ active });
+	const searchInput = ref(filter.value.search);
+	const onFilterChangeDebounced = debounce(() => onFilterChange(searchInput.value), 500);
+	const filterDeps = computed(() => ({ ...filter.value }));
+
+	const adminOptsRef = ref();
+	const STATUS_CODES = Object.keys(STATUS_MAP) as StatusCode[];
+
+	const { data: statusCounts, error: statusCountError } = await useLazyAsyncData(
+		() => $directus.request<[{ count: number; status: Status; isOutdated: boolean }]>(aggregate('gp_probes', {
+			query: {
+				filter: getDirectusFilter(filter, [ 'status' ]),
+				groupBy: [ 'status', 'isOutdated' ],
+			},
+			aggregate: { count: '*' },
+		})),
+		{
+			watch: [ filterDeps ],
+			default: () => Object.fromEntries(STATUS_CODES.map(status => [ status, 0 ])),
+			transform: (data) => {
+				const counts = Object.fromEntries(STATUS_CODES.map(status => [ status, 0 ]));
+
+				STATUS_CODES.forEach((code) => {
+					counts[code] = data.reduce((sum, status) => {
+						return STATUS_MAP[code].options.includes(status.status) && (status.isOutdated || !STATUS_MAP[code].outdatedOnly)
+							? sum + status.count
+							: sum;
+					}, 0);
+				});
+
+				return counts;
+			},
+		},
+	);
+
+	useErrorToast(statusCountError);
+
+	onBeforeUnmount(() => {
+		onFilterChangeDebounced.cancel();
+	});
+
+	onBeforeRouteLeave(() => {
+		active.value = false;
+	});
+</script>
diff --git a/composables/useProbeFilters.ts b/composables/useProbeFilters.ts
index f60320fb..ad9f5708 100644
--- a/composables/useProbeFilters.ts
+++ b/composables/useProbeFilters.ts
@@ -3,8 +3,10 @@ import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useUserFilter } from '~/composables/useUserFilter';
 import { ONLINE_STATUSES, OFFLINE_STATUSES } from '~/constants/probes';
+import { useAuth } from '~/store/auth';
 
 export type StatusCode = 'all' | 'online' | 'ping-test-failed' | 'offline' | 'online-outdated';
+export type AdoptionOption = 'all' | 'adopted' | 'non-adopted';
 
 type StatusOption = {
 	name: string;
@@ -17,9 +19,10 @@ export interface Filter {
 	status: StatusCode;
 	by: string;
 	desc: boolean;
+	adoption: AdoptionOption;
 }
 
-const DEFAULT_FILTER: Filter = { search: '', status: 'all', by: 'name', desc: false } as const;
+const DEFAULT_FILTER: Filter = { search: '', status: 'all', by: 'name', desc: false, adoption: 'all' } as const;
 
 export const SORTABLE_FIELDS: string[] = [ 'name', 'location', 'tags' ] as const;
 
@@ -31,12 +34,15 @@ export const STATUS_MAP: Record<StatusCode, StatusOption> = {
 	'offline': { name: 'Offline', options: OFFLINE_STATUSES },
 } as const;
 
+export const ADOPTION_OPTIONS: string[] = [ 'all', 'adopted', 'non-adopted' ] as const;
+
 interface ProbeFiltersOptions {
 	active?: MaybeRefOrGetter<boolean>;
 }
 
 export const useProbeFilters = ({ active = () => true }: ProbeFiltersOptions = {}) => {
 	const route = useRoute();
+	const auth = useAuth();
 	const { getUserFilter } = useUserFilter();
 
 	const filter = ref<Filter>({ ...DEFAULT_FILTER });
@@ -46,8 +52,8 @@ export const useProbeFilters = ({ active = () => true }: ProbeFiltersOptions = {
 		const { sortField = '', sortOrder = 1 } = event;
 
 		if (!sortOrder || typeof sortField !== 'string' || !SORTABLE_FIELDS.includes(sortField)) {
-			filter.value.by = 'name';
-			filter.value.desc = false;
+			filter.value.by = DEFAULT_FILTER.by;
+			filter.value.desc = DEFAULT_FILTER.desc;
 		} else {
 			filter.value.by = sortField;
 			filter.value.desc = sortOrder === -1;
@@ -68,9 +74,10 @@ export const useProbeFilters = ({ active = () => true }: ProbeFiltersOptions = {
 
 	const constructQuery = () => ({
 		...filter.value.search && { filter: filter.value.search },
-		...filter.value.by !== 'name' && { by: filter.value.by },
+		...!isDefault('by') && { by: filter.value.by },
 		...filter.value.desc && { desc: 'true' },
-		...filter.value.status !== 'all' && { status: filter.value.status },
+		...!isDefault('status') && { status: filter.value.status },
+		...auth.isAdmin && !isDefault('adoption') && { adoption: filter.value.adoption },
 	});
 
 	const onParamChange = () => {
@@ -100,19 +107,33 @@ export const useProbeFilters = ({ active = () => true }: ProbeFiltersOptions = {
 		}
 	};
 
-	const getCurrentFilter = (includeStatus: boolean = false) => ({
-		...getUserFilter('userId'),
-		...filter.value.search && { searchIndex: { _icontains: filter.value.search } },
-		...includeStatus && filter.value.status !== 'all' && { status: { _in: STATUS_MAP[filter.value.status].options } },
-		...includeStatus && filter.value.status === 'online-outdated' && { isOutdated: { _eq: true } },
-	});
+	const getCurrentFilter = (ignoredFields: Array<keyof Filter> = []) => getDirectusFilter(filter, ignoredFields);
+
+	const getDirectusFilter = (filter: MaybeRefOrGetter<Filter>, ignoredFields: Array<keyof Filter> = []) => {
+		const filterValue = toValue(filter);
+
+		return {
+			...getUserFilter('userId'),
+			...filterValue.search && { searchIndex: { _icontains: filterValue.search } },
+			...!ignoredFields.includes('status') && !isDefault('status', filter) && { status: { _in: STATUS_MAP[filterValue.status].options } },
+			...!ignoredFields.includes('status') && filterValue.status === 'online-outdated' && { isOutdated: { _eq: true } },
+			...!ignoredFields.includes('adoption') && auth.isAdmin && !isDefault('adoption', filter) && {
+				userId: filterValue.adoption === 'adopted' ? { _neq: null } : { _eq: null },
+			},
+		};
+	};
+
+	const isDefault = (field: keyof Filter, filterObj: MaybeRefOrGetter<Filter> = filter) => {
+		return toValue(filterObj)[field] === DEFAULT_FILTER[field];
+	};
 
 	watch([
 		() => route.query.filter,
 		() => route.query.by,
 		() => route.query.desc,
 		() => route.query.status,
-	], async ([ search, by, desc, status ]) => {
+		() => route.query.adoption,
+	], async ([ search, by, desc, status, adoption ]) => {
 		if (!toValue(active)) {
 			return;
 		}
@@ -140,6 +161,12 @@ export const useProbeFilters = ({ active = () => true }: ProbeFiltersOptions = {
 		} else {
 			filter.value.status = DEFAULT_FILTER.status;
 		}
+
+		if (typeof adoption === 'string' && ADOPTION_OPTIONS.includes(adoption) && auth.isAdmin) {
+			filter.value.adoption = adoption as AdoptionOption;
+		} else {
+			filter.value.adoption = DEFAULT_FILTER.adoption;
+		}
 	}, { immediate: true });
 
 	return {
@@ -149,10 +176,13 @@ export const useProbeFilters = ({ active = () => true }: ProbeFiltersOptions = {
 		// handlers
 		onSortChange,
 		onFilterChange,
-		onStatusChange: () => onParamChange(),
+		onParamChange,
 		onBatchChange,
 		// builders
 		getSortSettings,
 		getCurrentFilter,
+		getDirectusFilter,
+		// helpers
+		isDefault,
 	};
 };
diff --git a/pages/notifications.vue b/pages/notifications.vue
index 6dbe28c0..02bca8ae 100644
--- a/pages/notifications.vue
+++ b/pages/notifications.vue
@@ -102,7 +102,7 @@
 		{ default: () => [], watch: [ first, itemsPerPage ] },
 	);
 
-	const { data: notificationsCount, error: notificationCntError } = await useLazyAsyncData(
+	const { data: notificationsCount, error: notificationCountError } = await useLazyAsyncData(
 		'directus_notifications_cnt',
 		() => $directus.request<{ count: { id: number } }[]>(readNotifications({
 			filter: getUserFilter('recipient'),
@@ -113,7 +113,7 @@
 		{ default: () => 0, transform: data => data?.[0]?.count?.id ?? 0 },
 	);
 
-	useErrorToast(notificationError, notificationCntError);
+	useErrorToast(notificationError, notificationCountError);
 
 	notificationBus.on((idsToArchive) => {
 		notifications.value.forEach((notification) => {
diff --git a/pages/probes/index.vue b/pages/probes/index.vue
index 5a8ce385..969a1ed1 100644
--- a/pages/probes/index.vue
+++ b/pages/probes/index.vue
@@ -19,7 +19,7 @@
 				<span class="font-bold">Adopt a probe</span>
 			</Button>
 		</div>
-		<div v-if="hasAnyProbes || loading || countLoading">
+		<div v-if="hasAnyProbes || firstLoading || countLoading">
 			<div class="max-md:hidden">
 				<DataTable
 					ref="dataTableRef"
@@ -28,7 +28,7 @@
 					lazy
 					:rows="itemsPerPage"
 					data-key="id"
-					:total-records="paginatedRecords"
+					:total-records="filteredProbeCount"
 					sort-mode="single"
 					:sort-field="filter.by"
 					:sort-order="filter.desc ? -1 : 1"
@@ -41,51 +41,7 @@
 					<template #header>
 						<div class="flex w-full items-center">
 							<h3 class="px-2">List of probes</h3>
-
-							<div class="ml-auto flex h-9 items-stretch gap-x-4 self-end font-normal">
-								<span class="flex items-center font-bold">Status:</span>
-								<Select
-									v-model="filter.status"
-									:options="STATUS_CODES"
-									:pt="{ listContainer: { class: '!max-h-64' } }"
-									option-label="code"
-									class="min-w-64"
-									@change="onStatusChange"
-								>
-									<template #option="{option}: {option: StatusCode}">
-										<span class="flex h-full items-center gap-2">
-											<span
-												:class="{
-													'font-bold text-bluegray-900 dark:text-white': option === filter.status,
-													'text-bluegray-400': option !== filter.status
-												}">
-												{{ STATUS_MAP[option].name }}
-											</span>
-											<Tag
-												class="-my-0.5"
-												:class="{
-													'bg-primary text-white dark:bg-white dark:text-bluegray-900 ': option === filter.status,
-													'border border-surface-300 bg-surface-0 text-bluegray-900 dark:border-dark-600 dark:bg-dark-800 dark:text-surface-0': option !== filter.status
-												}">
-												{{ statusCounts[option] }}
-											</Tag>
-										</span>
-									</template>
-
-									<template #value="{value}: {value: StatusCode}">
-										<span class="flex h-full items-center gap-2">
-											<span class="text-bluegray-400">{{ STATUS_MAP[value].name }}</span>
-											<Tag class="-my-1 border ">{{ statusCounts[value] }}</Tag>
-										</span>
-									</template>
-								</Select>
-								<InputGroup class="!w-auto">
-									<IconField>
-										<InputIcon class="pi pi-search"/>
-										<InputText v-model="searchInput" class="m-0 h-full min-w-[280px]" placeholder="Filter by name, location, or tags" @input="onFilterChangeDebounced"/>
-									</IconField>
-								</InputGroup>
-							</div>
+							<ProbeListFilters/>
 						</div>
 					</template>
 
@@ -100,8 +56,14 @@
 							<AsyncCell :loading="loading">
 								<NuxtLink :to="`/probes/${slotProps.data.id}`" class="flex h-full items-center">
 									<div class="grid grid-cols-[auto_1fr] grid-rows-[auto_auto] gap-x-3 px-2">
-										<BigProbeIcon class="col-span-1 row-span-2" :probe="slotProps.data" border/>
-										<p class="col-start-2 col-end-3 flex items-center font-bold">{{ slotProps.data.name || slotProps.data.city }}</p>
+										<BigProbeIcon class="inset-y-0 col-span-1 row-span-2 my-auto" :probe="slotProps.data" border/>
+										<p class="wrap-anywhere col-start-2 col-end-3 font-bold">
+											{{ slotProps.data.name || slotProps.data.city }}<span v-if="auth.isAdmin">,
+												<span class="font-normal text-bluegray-800 dark:text-bluegray-300">
+													{{slotProps.data.user?.github_username ?? 'not adopted'}}
+												</span>
+											</span>
+										</p>
 										<p class="col-start-2 col-end-3 row-start-2 row-end-3 text-[13px] text-bluegray-900 dark:text-bluegray-400">{{ slotProps.data.ip }}</p>
 									</div>
 								</NuxtLink>
@@ -179,10 +141,8 @@
 							ref="mobileFiltersRef"
 							class="!left-1/2 w-[95%] !-translate-x-1/2 !transform p-6 [&>*]:border-none"
 							role="dialog">
-							<FilterSettings
-								:status-counts="statusCounts as Record<StatusCode, number>"
-								:filter="filter"
-								@apply="(newFilter) => {mobileFiltersRef.toggle(); onBatchChange(newFilter)}"
+							<MobileProbeListFilters
+								@apply="() => mobileFiltersRef.toggle()"
 								@cancel="mobileFiltersRef.hide()"
 							/>
 						</Popover>
@@ -194,9 +154,15 @@
 								<div v-for="probe in probes" :key="probe.id" class="probe box-content block pb-2 pt-4">
 									<NuxtLink :to="`/probes/${probe.id}`">
 										<div class="mb-6 grid grid-cols-[auto_1fr] grid-rows-[auto_auto] gap-x-3">
-											<BigProbeIcon class="col-span-1 row-span-2" :probe="probe" border/>
-											<div class="col-start-2 col-end-3 flex items-center font-bold">
-												<p>{{ probe.name || probe.city }}</p>
+											<BigProbeIcon class="inset-y-0 col-span-1 row-span-2 my-auto" :probe="probe" border/>
+											<div class="col-start-2 col-end-3 flex flex-wrap items-center gap-x-1 font-bold">
+												<p class="wrap-anywhere col-start-2 col-end-3 font-bold">
+													{{ probe.name || probe.city }}<span v-if="auth.isAdmin">,
+														<span class="font-normal text-bluegray-800 dark:text-bluegray-300">
+															{{probe.user?.github_username ?? 'not adopted'}}
+														</span>
+													</span>
+												</p>
 											</div>
 											<p class="col-start-2 col-end-3 max-w-full overflow-hidden text-ellipsis text-[13px] text-bluegray-400">{{ probe.ip }}</p>
 										</div>
@@ -231,7 +197,7 @@
 								</div>
 								<div class="mt-2 flex items-center justify-between">
 									<span class="text-xs font-bold">Number of probes:</span>
-									<Tag class="ml-2 flex items-center border bg-surface-0 !text-sm" severity="success">{{ statusCounts[filter.status] }}</Tag>
+									<Tag class="ml-2 flex items-center border bg-surface-0 !text-sm" severity="success">{{ filteredProbeCount }}</Tag>
 								</div>
 								<Button
 									class="mt-2 w-full"
@@ -251,7 +217,7 @@
 				class="mt-6"
 				:first="first"
 				:rows="itemsPerPage"
-				:total-records="paginatedRecords"
+				:total-records="filteredProbeCount"
 				:page-link-size="pageLinkSize"
 				:template="template"
 				@page="page = $event.page"
@@ -306,16 +272,17 @@
 
 <script setup lang="ts">
 	import { aggregate, readItems } from '@directus/sdk';
-	import debounce from 'lodash/debounce';
 	import CountryFlag from 'vue-country-flag-next';
 	import BigProbeIcon from '~/components/BigProbeIcon.vue';
-	import FilterSettings from '~/components/FilterSettings.vue';
+	import MobileProbeListFilters from '~/components/probe/ProbeFilters/MobileProbeListFilters.vue';
+	import ProbeListFilters from '~/components/probe/ProbeFilters/ProbeListFilters.vue';
 	import { computedDebounced } from '~/composables/computedDebounced';
 	import { useGoogleMaps } from '~/composables/maps';
 	import { usePagination } from '~/composables/pagination';
 	import { useErrorToast } from '~/composables/useErrorToast';
-	import { type StatusCode, useProbeFilters, STATUS_MAP } from '~/composables/useProbeFilters';
+	import { useProbeFilters } from '~/composables/useProbeFilters';
 	import { useUserFilter } from '~/composables/useUserFilter';
+	import { useAuth } from '~/store/auth';
 	import { minDelay } from '~/utils/min-delay';
 	import { pluralize } from '~/utils/pluralize';
 
@@ -324,6 +291,7 @@
 	const { $directus } = useNuxtApp();
 	const router = useRouter();
 	const route = useRoute();
+	const auth = useAuth();
 
 	const itemsPerPage = ref(config.public.itemsPerTablePage);
 	const startProbeDialog = ref(false);
@@ -336,9 +304,6 @@
 	const gmapsLoaded = ref(false);
 	const selectedProbes = ref<Probe[]>([]);
 	const deleteProbesDialog = ref(false);
-	const paginatedRecords = ref(0);
-
-	const STATUS_CODES = Object.keys(STATUS_MAP) as StatusCode[];
 
 	const { getUserFilter } = useUserFilter();
 
@@ -354,9 +319,6 @@
 		filter,
 		anyFilterApplied,
 		onSortChange,
-		onFilterChange,
-		onStatusChange,
-		onBatchChange,
 		getSortSettings,
 		getCurrentFilter,
 	} = useProbeFilters({ active });
@@ -381,7 +343,7 @@
 		},
 	);
 
-	const { data: probeCount, pending: countLoading } = await useLazyAsyncData(
+	const { data: probeCount, pending: countLoading, refresh: refreshProbeCount } = await useLazyAsyncData(
 		() => $directus.request<[{ count: number }]>(aggregate('gp_probes', {
 			query: {
 				filter: getUserFilter('userId'),
@@ -398,11 +360,18 @@
 	});
 
 	const { data: probes, pending: loading, error: probeError, refresh: refreshProbes } = await useLazyAsyncData(
-		() => minDelay($directus.request<Probe[]>(readItems('gp_probes', {
-			filter: getCurrentFilter(true),
+		() => minDelay($directus.request<ProbeWithUser[]>(readItems('gp_probes', {
+			filter: getCurrentFilter(),
 			sort: getSortSettings() as any, // the directus QuerySort type does not include the count(...) versions of fields, leading to a TS error.
 			offset: first.value,
 			limit: itemsPerPage.value,
+			fields: [
+				'*',
+				{ user: [ 'id', 'github_username' ] } as unknown as 'userId', // directus SDK types do not support relational fields
+			],
+			alias: {
+				user: 'userId',
+			},
 		}))),
 		{
 			watch: [ mainFetchDeps ],
@@ -411,36 +380,21 @@
 		},
 	);
 
-	const { data: statusCounts, error: statusCntError, refresh: refreshStatusCounts } = await useLazyAsyncData(
-		() => minDelay($directus.request<[{ count: number; status: Status; isOutdated: boolean }]>(aggregate('gp_probes', {
-			query: {
-				filter: getCurrentFilter(),
-				groupBy: [ 'status', 'isOutdated' ],
-			},
+	const { data: filteredProbeCount, error: filteredProbeCountError, refresh: refreshFilteredProbeCount, pending: filteredProbeCountLoading } = await useLazyAsyncData(
+		() => $directus.request<[{ count: number }]>(readItems('gp_probes', {
+			filter: getCurrentFilter(),
 			aggregate: { count: '*' },
-		}))),
+		})),
 		{
 			watch: [ filterDeps ],
-			default: () => Object.fromEntries(STATUS_CODES.map(status => [ status, 0 ])),
-			transform: (data) => {
-				const counts = Object.fromEntries(STATUS_CODES.map(status => [ status, 0 ]));
-
-				STATUS_CODES.forEach((code) => {
-					counts[code] = data.reduce((sum, status) => {
-						return STATUS_MAP[code].options.includes(status.status) && (status.isOutdated || !STATUS_MAP[code].outdatedOnly)
-							? sum + status.count
-							: sum;
-					}, 0);
-				});
-
-				return counts;
-			},
+			default: () => 0,
+			transform: data => data?.[0]?.count ?? 0,
 		},
 	);
 
-	useErrorToast(creditError, probeError, statusCntError);
+	useErrorToast(creditError, probeError, filteredProbeCountError);
 
-	const refresh = () => Promise.all([ refreshProbes(), refreshStatusCounts() ]);
+	const refresh = () => Promise.all([ refreshProbes(), refreshFilteredProbeCount(), refreshProbeCount() ]);
 
 	watch([ probes, loading ], async ([ adoptedProbes, isLoading ]) => {
 		if (isLoading) {
@@ -470,14 +424,7 @@
 		}
 	});
 
-	watch(statusCounts, (newStatusCounts) => {
-		paginatedRecords.value = newStatusCounts[filter.value.status]!;
-		hasAnyProbes.value = hasAnyProbes.value || !!newStatusCounts['all'];
-	}, { deep: true, immediate: true });
-
-	const displayPagination = computed(() => probes.value.length && probes.value.length !== statusCounts.value[filter.value.status]);
-	const onFilterChangeDebounced = debounce(() => onFilterChange(searchInput.value), 500);
-	const searchInput = ref(filter.value.search);
+	const displayPagination = computed(() => probes.value.length && !filteredProbeCountLoading.value && filteredProbeCount.value > itemsPerPage.value);
 
 	// PROBES LIST
 	onMounted(async () => {
@@ -533,10 +480,6 @@
 		refresh();
 	};
 
-	onBeforeUnmount(() => {
-		onFilterChangeDebounced.cancel();
-	});
-
 	onBeforeRouteLeave(() => { active.value = false; });
 </script>
 
diff --git a/pages/tokens.vue b/pages/tokens.vue
index 86f0e7d8..7c14cbf1 100644
--- a/pages/tokens.vue
+++ b/pages/tokens.vue
@@ -253,7 +253,7 @@
 		},
 	);
 
-	const { data: tokensCount, pending: tokenCountPending, error: tokenCntError, refresh: refreshTokenCount } = await useAsyncData(
+	const { data: tokensCount, pending: tokenCountPending, error: tokenCountError, refresh: refreshTokenCount } = await useAsyncData(
 		() => $directus.request<[{ count: number }]>(aggregate(
 			'gp_tokens',
 			{
@@ -454,5 +454,5 @@
 	};
 
 	// ERROR HANDLING
-	useErrorToast(tokenError, tokenCntError, applicationError);
+	useErrorToast(tokenError, tokenCountError, applicationError);
 </script>
diff --git a/types.ts b/types.ts
index 50176fe8..6a59ed26 100644
--- a/types.ts
+++ b/types.ts
@@ -121,6 +121,8 @@ declare global {
 		customLocation: CustomLocation<TCountry>;
 	};
 
+	type ProbeWithUser<TCountry extends string = string> = Probe<TCountry> & { user: Partial<User> };
+
 	type User = {
 		id: string;
 		first_name: string | null;