diff --git a/packages/frontend-core/src/fetch/UserFetch.ts b/packages/frontend-core/src/fetch/UserFetch.ts
index a0f95afe3e..e276af3592 100644
--- a/packages/frontend-core/src/fetch/UserFetch.ts
+++ b/packages/frontend-core/src/fetch/UserFetch.ts
@@ -2,11 +2,30 @@ import { get } from "svelte/store"
 import DataFetch from "./DataFetch"
 import { TableNames } from "../constants"
 import { utils } from "@budibase/shared-core"
-import { BasicOperator, Table } from "@budibase/types"
+import {
+  BasicOperator,
+  SearchFilters,
+  SearchUsersRequest,
+  Table,
+} from "@budibase/types"
 import { APIClient } from "../api/types.js"
 
-export default class UserFetch extends DataFetch<{ tableId: string }, {}> {
-  constructor(opts: { API: APIClient; datasource: Table; options?: {} }) {
+interface UserFetchQuery {
+  appId: string
+  paginated: boolean
+}
+
+export default class UserFetch extends DataFetch<
+  { tableId: string },
+  {},
+  UserFetchQuery
+> {
+  constructor(opts: {
+    API: APIClient
+    datasource: Table
+    options?: {}
+    query: UserFetchQuery
+  }) {
     super({
       ...opts,
       datasource: {
@@ -38,13 +57,14 @@ export default class UserFetch extends DataFetch<{ tableId: string }, {}> {
     const { cursor, query } = get(this.store)
 
     // Convert old format to new one - we now allow use of the lucene format
-    const { appId, paginated, ...rest } = query || ({} as any) // TODO
-    const finalQuery = utils.isSupportedUserSearch(rest)
-      ? query
-      : { [BasicOperator.EMPTY]: { email: true } } // TODO: check
+    const { appId, paginated, ...rest } = query || {}
+
+    const finalQuery: SearchFilters = utils.isSupportedUserSearch(rest)
+      ? rest
+      : { [BasicOperator.EMPTY]: { email: true } }
 
     try {
-      const opts = {
+      const opts: SearchUsersRequest = {
         bookmark: cursor ?? undefined,
         query: finalQuery ?? undefined,
         appId: appId,
diff --git a/packages/shared-core/src/utils.ts b/packages/shared-core/src/utils.ts
index e2c40a8849..fac8fa61ee 100644
--- a/packages/shared-core/src/utils.ts
+++ b/packages/shared-core/src/utils.ts
@@ -109,7 +109,9 @@ export function trimOtherProps(object: any, allowedProps: string[]) {
   return result
 }
 
-export function isSupportedUserSearch(query: SearchFilters) {
+export function isSupportedUserSearch(
+  query: SearchFilters
+): query is SearchFilters {
   const allowed = [
     { op: BasicOperator.STRING, key: "email" },
     { op: BasicOperator.EQUAL, key: "_id" },