diff --git a/ui/packages/evidently-ui-lib/src/router-utils/utils.tsx b/ui/packages/evidently-ui-lib/src/router-utils/utils.tsx
index 0fd04e5825..0d47d3809e 100644
--- a/ui/packages/evidently-ui-lib/src/router-utils/utils.tsx
+++ b/ui/packages/evidently-ui-lib/src/router-utils/utils.tsx
@@ -1,7 +1,12 @@
 import { expectJsonRequest } from '~/api/utils'
 import { GenericErrorBoundary, handleActionFetchersErrors } from '~/router-utils/components/Error'
 import type { ActionSpecialArgs, LoaderSpecialArgs, RouteExtended } from '~/router-utils/types'
-import type { LazyRouteFunction, RouteObject } from '~/shared-dependencies/react-router-dom'
+import type {
+  ActionFunction,
+  LazyRouteFunction,
+  LoaderFunction,
+  RouteObject
+} from '~/shared-dependencies/react-router-dom'
 
 import {
   Button,
@@ -18,45 +23,52 @@ export type CrumbDefinition = { title?: string; param?: string; keyFromLoaderDat
 
 export type HandleWithCrumb = { crumb?: CrumbDefinition }
 
-export const decorateAllRoutes = (r: RouteExtended): RouteExtended => {
+// biome-ignore lint/suspicious/noExplicitAny: fine
+const replaceLoaderSpecial = (loaderSpecial: (args: LoaderSpecialArgs) => any) => {
+  const loader: LoaderFunction = async (args) => {
+    const { searchParams } = new URL(args.request.url)
+    const query = Object.fromEntries(searchParams)
+
+    return loaderSpecial({ ...args, searchParams, query })
+  }
+
+  return loader
+}
+
+// biome-ignore lint/suspicious/noExplicitAny: fine
+const replaceActionSpecial = (actionSpecial: (args: ActionSpecialArgs) => any) => {
+  const action: ActionFunction = async (args) => {
+    expectJsonRequest(args.request)
+    const data = await args.request.json()
+
+    return actionSpecial({ ...args, data })
+  }
+
+  return action
+}
+
+export const decorateAllRoutes = (
+  r: RouteExtended,
+  ErrorBoundary: () => JSX.Element = GenericErrorBoundary
+): RouteExtended => {
   if (r.lazy) {
     // @ts-ignore
     return {
       ...r,
       lazy: (() => r.lazy?.().then(decorateAllRoutes)) as LazyRouteFunction<RouteObject>,
-      children: r.children ? r.children.map(decorateAllRoutes) : undefined
+      action: r.actionSpecial ? replaceActionSpecial(r.actionSpecial) : undefined,
+      loader: r.loaderSpecial ? replaceLoaderSpecial(r.loaderSpecial) : undefined,
+      ErrorBoundary: r.ErrorBoundary ? r.ErrorBoundary : ErrorBoundary,
+      children: r.children ? r.children.map((r) => decorateAllRoutes(r, ErrorBoundary)) : undefined
     }
   }
 
   return {
     ...r,
-    children: r.children ? r.children.map(decorateAllRoutes) : undefined,
-    ErrorBoundary: r.ErrorBoundary ? r.ErrorBoundary : GenericErrorBoundary,
-    action: r.actionSpecial
-      ? async (args) => {
-          expectJsonRequest(args.request)
-
-          const data = await args.request.json()
-
-          if (r.actionSpecial) {
-            return r.actionSpecial({ ...args, data } satisfies ActionSpecialArgs)
-          }
-
-          return null
-        }
-      : undefined,
-    loader: r.loaderSpecial
-      ? async (args) => {
-          const { searchParams } = new URL(args.request.url)
-          const query = Object.fromEntries(searchParams)
-
-          if (r.loaderSpecial) {
-            return r.loaderSpecial({ ...args, searchParams, query } satisfies LoaderSpecialArgs)
-          }
-
-          return null
-        }
-      : undefined
+    children: r.children ? r.children.map((r) => decorateAllRoutes(r, ErrorBoundary)) : undefined,
+    ErrorBoundary: r.ErrorBoundary ? r.ErrorBoundary : ErrorBoundary,
+    action: r.actionSpecial ? replaceActionSpecial(r.actionSpecial) : undefined,
+    loader: r.loaderSpecial ? replaceLoaderSpecial(r.loaderSpecial) : undefined
   } as RouteExtended
 }
 
diff --git a/ui/service/src/_routes/components.tsx b/ui/service/src/_routes/components.tsx
index fa729f5ca0..54c301deca 100644
--- a/ui/service/src/_routes/components.tsx
+++ b/ui/service/src/_routes/components.tsx
@@ -6,11 +6,12 @@ import {
 
 import type { GetParams } from 'evidently-ui-lib/router-utils/types'
 import { useMatch } from 'evidently-ui-lib/shared-dependencies/react-router-dom'
-import type { Routes } from './types'
+import type { GetRouteByPath, Routes } from './types'
 
-type RouterLinkProps<K extends string> = RouterLinkTemplateComponentProps & {
+type RouterLinkProps<K extends Paths> = RouterLinkTemplateComponentProps & {
   to: K
   paramsToReplace: GetParams<K>
+  query?: GetRouteByPath<K>['loader']['query']
 }
 
 type Paths = Routes['path']
diff --git a/ui/service/src/_routes/router.tsx b/ui/service/src/_routes/router.tsx
index 6a2e8e00e0..4a6b7e91f9 100644
--- a/ui/service/src/_routes/router.tsx
+++ b/ui/service/src/_routes/router.tsx
@@ -50,5 +50,5 @@ export const routes = [
 ] as const satisfies RouteExtended[]
 
 export const _router = createBrowserRouter(
-  [...routes].map(decorateTopLevelRoutes).map(decorateAllRoutes)
+  routes.map(decorateTopLevelRoutes).map((r) => decorateAllRoutes(r))
 )
diff --git a/ui/service/src/_routes/src/reports-list/reports-list-main.tsx b/ui/service/src/_routes/src/reports-list/reports-list-main.tsx
index c3b725e995..76352a2ad5 100644
--- a/ui/service/src/_routes/src/reports-list/reports-list-main.tsx
+++ b/ui/service/src/_routes/src/reports-list/reports-list-main.tsx
@@ -74,8 +74,8 @@ const LinkToSnapshot = ({ snapshotId, projectId }: { snapshotId: string; project
   return (
     <RouterLink
       type='button'
-      // type safe!
       disabled={disabled}
+      // type safe!
       to={'/:projectId/reports/:snapshotId'}
       paramsToReplace={{ projectId, snapshotId }}
       title={'View'}