diff --git a/src/features/tasks/components/contest-table/TaskTable.svelte b/src/features/tasks/components/contest-table/TaskTable.svelte
index fd4d6b1d2..037161d4d 100644
--- a/src/features/tasks/components/contest-table/TaskTable.svelte
+++ b/src/features/tasks/components/contest-table/TaskTable.svelte
@@ -66,7 +66,7 @@
   let contestTableMaps = $derived(prepareContestTablesMap(providers));
 
   function prepareContestTablesMap(providers: ContestTableProvider[]): Map<string, ProviderData> {
-    const map = new Map<string, ProviderData>();
+    const map = new SvelteMap<string, ProviderData>();
 
     for (const provider of providers) {
       const abbreviationName = provider.getMetadata().abbreviationName;
@@ -162,7 +162,7 @@
   });
 
   let taskIndicesMap = $derived.by(() => {
-    const indices = new Map<ContestTaskPairKey, number>();
+    const indices = new SvelteMap<ContestTaskPairKey, number>();
 
     taskResults.forEach((task, index) => {
       const key = createContestTaskPairKey(task.contest_id, task.task_id);
diff --git a/src/lib/components/AuthForm.svelte b/src/lib/components/AuthForm.svelte
index e3f18979b..c0e691eda 100644
--- a/src/lib/components/AuthForm.svelte
+++ b/src/lib/components/AuthForm.svelte
@@ -224,6 +224,7 @@
 
       <div class="text-sm font-medium text-gray-500 dark:text-gray-300">
         {confirmationMessage}
+        <!-- eslint-disable-next-line svelte/no-navigation-without-resolve -->
         <a href={alternativeHref} class="text-primary-700 hover:underline dark:text-primary-500">
           {alternativePageName}
         </a>
diff --git a/src/routes/(admin)/workbooks/order/_components/KanbanBoard.svelte b/src/routes/(admin)/workbooks/order/_components/KanbanBoard.svelte
index 24c28ad88..e35dbcb40 100644
--- a/src/routes/(admin)/workbooks/order/_components/KanbanBoard.svelte
+++ b/src/routes/(admin)/workbooks/order/_components/KanbanBoard.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { page } from '$app/stores';
   import { replaceState } from '$app/navigation';
+  import { resolve } from '$app/paths';
   import { untrack } from 'svelte';
 
   import { Toast } from 'flowbite-svelte';
@@ -59,7 +60,8 @@
       selectedSolutionCategories,
       selectedGrades,
     );
-    replaceState(updatedUrl, {});
+    // @ts-expect-error svelte-check TS2554: AppTypes declaration merging causes RouteId to resolve as string, requiring params. Runtime behavior is correct.
+    replaceState(resolve(updatedUrl.pathname) + updatedUrl.search + updatedUrl.hash, $page.state);
   }
 
   let allItems = $state<Record<string, KanbanColumns>>(