diff --git a/src/lib/stores/wizard.ts b/src/lib/stores/wizard.ts
index 355eb7afc..b349d6206 100644
--- a/src/lib/stores/wizard.ts
+++ b/src/lib/stores/wizard.ts
@@ -20,7 +20,7 @@ function createWizardStore() {
     return {
         subscribe,
         set,
-        start: (component: typeof SvelteComponent, media: string = null) =>
+        start: <CMP extends typeof SvelteComponent>(component: CMP, media: string = null) =>
             update((n) => {
                 n.show = true;
                 n.component = component;
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.ts b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.ts
index 0c15a026e..219c82b34 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.ts
+++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.ts
@@ -1,22 +1,23 @@
-import { Query } from '@aw-labs/appwrite-console';
-import { sdkForProject } from '$lib/stores/sdk';
-import { pageToOffset } from '$lib/helpers/load';
+import { Query } from '@appwrite.io/console';
+import { sdk } from '$lib/stores/sdk';
+import { getLimit, getPage, getSearch, pageToOffset } from '$lib/helpers/load';
 import { Dependencies, PAGE_LIMIT } from '$lib/constants';
 import type { PageLoad } from './$types';
 
-export const load: PageLoad = async ({ params, parent, depends, url }) => {
-    await parent();
+export const load: PageLoad = async ({ params, depends, url, route }) => {
     depends(Dependencies.FILES);
-    const page = Number(params.page);
-    const offset = pageToOffset(page, PAGE_LIMIT);
-    const search = url.search.slice(1) ?? undefined;
+    const page = getPage(url);
+    const search = getSearch(url);
+    const limit = getLimit(url, route, PAGE_LIMIT);
+    const offset = pageToOffset(page, limit);
 
     return {
         offset,
+        limit,
         search,
-        files: await sdkForProject.storage.listFiles(
+        files: await sdk.forProject.storage.listFiles(
             params.bucket,
-            [Query.limit(PAGE_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt')],
+            [Query.limit(limit), Query.offset(offset), Query.orderDesc('$createdAt')],
             search
         )
     };
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/create.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/create.svelte
index 736c2f25a..df3f4494e 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/create.svelte
+++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/create.svelte
@@ -8,7 +8,7 @@
     import { addNotification } from '$lib/stores/notifications';
     import { uploader } from '$lib/stores/uploader';
     import { wizard } from '$lib/stores/wizard';
-    import { ID } from '@aw-labs/appwrite-console';
+    import { ID } from '@appwrite.io/console';
     import Step1 from './step1.svelte';
     import Step2 from './step2.svelte';
     import { createFile } from './store';