diff --git a/packages/bbui/src/helpers.d.ts b/packages/bbui/src/helpers.d.ts
new file mode 100644
index 0000000000..98c6060590
--- /dev/null
+++ b/packages/bbui/src/helpers.d.ts
@@ -0,0 +1 @@
+export const cloneDeep: <T>(obj: T) => T
diff --git a/packages/frontend-core/src/fetch/QueryFetch.ts b/packages/frontend-core/src/fetch/QueryFetch.ts
index a6ddcd8f01..f8506fefec 100644
--- a/packages/frontend-core/src/fetch/QueryFetch.ts
+++ b/packages/frontend-core/src/fetch/QueryFetch.ts
@@ -5,9 +5,15 @@ import { get } from "svelte/store"
 
 interface QueryDatasource {
   _id: string
-  fields: any
-  queryParams: any
-  parameters: any
+  fields: Record<string, any> & {
+    pagination?: {
+      type: string
+      location: string
+      pageParam: string
+    }
+  }
+  queryParams: Record<string, string>
+  parameters: { name: string; default: string }[]
 }
 
 export default class QueryFetch extends DataFetch<QueryDatasource, Query> {
@@ -49,8 +55,8 @@ export default class QueryFetch extends DataFetch<QueryDatasource, Query> {
     const type = definition?.fields?.pagination?.type
 
     // Set the default query params
-    let parameters = Helpers.cloneDeep(datasource?.queryParams || {})
-    for (let param of datasource?.parameters || {}) {
+    const parameters = Helpers.cloneDeep(datasource.queryParams)
+    for (const param of datasource?.parameters || []) {
       if (!parameters[param.name]) {
         parameters[param.name] = param.default
       }