diff --git a/e2e/screenshots/simulator/recurring/Recurring_limit_limit/form.png b/e2e/screenshots/simulator/recurring/Recurring_limit_limit/form.png
index db3e35ebd..b8733be31 100644
Binary files a/e2e/screenshots/simulator/recurring/Recurring_limit_limit/form.png and b/e2e/screenshots/simulator/recurring/Recurring_limit_limit/form.png differ
diff --git a/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png b/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png
index 2c5f8765c..8629403e5 100644
Binary files a/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png and b/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png differ
diff --git a/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-input-price.png b/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-input-price.png
index aab57abc6..66444396e 100644
Binary files a/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-input-price.png and b/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-input-price.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png
index 1a0d7670e..a38048d44 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png
index e0ffd028c..f5d89df50 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/deposit/form.png
index 6faeeae05..34ef7c3e0 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/deposit/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/deposit/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png
index 63fc510fa..472c8d886 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/form.png
index 10d7a0f30..228c75d28 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png
index 726e121ba..a49c517b5 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/duplicate/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/duplicate/form.png
index 184069c87..68f49cc6b 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/duplicate/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/duplicate/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/undercut/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/undercut/form.png
index c51ddbae2..cfa103abc 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/undercut/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/undercut/form.png differ
diff --git a/package.json b/package.json
index 233510744..738556a37 100644
--- a/package.json
+++ b/package.json
@@ -15,10 +15,11 @@
     "@sentry/vite-plugin": "^2.21.1",
     "@tanstack/react-query": "^5.40.1",
     "@tanstack/react-query-devtools": "^5.40.1",
-    "@tanstack/react-router": "^1.4.9",
+    "@tanstack/react-router": "1.57.18",
     "@tanstack/react-table": "^8.9.3",
     "@tanstack/react-virtual": "^3.0.0-beta.30",
     "@tanstack/router-devtools": "^1.4.9",
+    "@tanstack/router-valibot-adapter": "^1.57.18",
     "@testing-library/dom": "^10.2.0",
     "@testing-library/jest-dom": "^6.4.6",
     "@testing-library/react": "^16.0.0",
@@ -132,4 +133,4 @@
     "@types/d3": "^7.4.3"
   },
   "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
-}
\ No newline at end of file
+}
diff --git a/src/components/activity/ActivityProvider.tsx b/src/components/activity/ActivityProvider.tsx
index a5f43d68b..db0bc4a0d 100644
--- a/src/components/activity/ActivityProvider.tsx
+++ b/src/components/activity/ActivityProvider.tsx
@@ -19,7 +19,7 @@ interface ActivityContextType {
   status: 'error' | 'pending' | 'success';
   fetchStatus: FetchStatus;
   queryParams: QueryActivityParams;
-  searchParams: ActivitySearchParams;
+  searchParams: Partial<ActivitySearchParams>;
   setSearchParams: (searchParams: Partial<ActivitySearchParams>) => any;
 }
 
@@ -51,13 +51,18 @@ const getQueryParams = (
   return params;
 };
 
+type ActivityUrls =
+  | '/strategies/activity'
+  | '/explore/$type/$slug/activity'
+  | '/strategy/$id';
 interface Props {
+  url: ActivityUrls;
   params: QueryActivityParams;
   children: ReactNode;
 }
 type ParamsKey = Extract<keyof QueryActivityParams, string>;
-export const ActivityProvider: FC<Props> = ({ children, params }) => {
-  const nav = useNavigate();
+export const ActivityProvider: FC<Props> = ({ children, params, url }) => {
+  const nav = useNavigate({ from: url });
   const searchParams: ActivitySearchParams = useSearch({ strict: false });
   const limit = searchParams.limit;
   const offset = searchParams.offset;
@@ -78,17 +83,7 @@ export const ActivityProvider: FC<Props> = ({ children, params }) => {
         replace: true,
         resetScroll: false,
         params: (params) => params,
-        search: (currentSearch) => {
-          const updates = structuredClone(changes);
-          const search = structuredClone(currentSearch);
-          for (const [key, value] of Object.entries(changes)) {
-            if (isEmpty(value)) {
-              delete (updates as any)[key];
-              if (key in search) delete (search as any)[key];
-            }
-          }
-          return { ...search, ...updates };
-        },
+        search: (current) => ({ ...current, ...changes }),
       });
     },
     [nav]
diff --git a/src/components/activity/utils.ts b/src/components/activity/utils.ts
index 4018adf4d..b8f50cbe9 100644
--- a/src/components/activity/utils.ts
+++ b/src/components/activity/utils.ts
@@ -1,12 +1,10 @@
-import { PaginationParams } from 'hooks/useList';
 import { Activity, ActivityAction } from 'libs/queries/extApi/activity';
 import {
-  SearchParamsValidator,
+  InferSearch,
+  searchValidator,
   validArrayOf,
-  validLiteral,
-  validNumber,
+  validNumberType,
   validString,
-  validateSearchParams,
 } from 'libs/routing/utils';
 import { SafeDecimal } from 'libs/safedecimal';
 import {
@@ -16,18 +14,8 @@ import {
   tokenRange,
 } from 'utils/helpers';
 import { exist } from 'utils/helpers/operators';
+import * as v from 'valibot';
 
-export interface ActivitySearchParams extends Partial<PaginationParams> {
-  pairs?: string[];
-  ids?: string[];
-  actions?: ActivityAction[];
-  start?: Date;
-  end?: Date;
-  // This is only for StrategyPageParams, but if I don't implement it here the build breaks
-  priceStart?: string;
-  priceEnd?: string;
-  hideIndicators?: boolean;
-}
 export const activityActionName: Record<ActivityAction, string> = {
   create: 'Create',
   edit: 'Edit Price',
@@ -43,29 +31,17 @@ export const activityActions = Object.keys(
   activityActionName
 ) as ActivityAction[];
 
-export const activityValidators: SearchParamsValidator<ActivitySearchParams> = {
-  actions: validArrayOf(validLiteral(activityActions)),
-  ids: validArrayOf(validString),
-  pairs: validArrayOf(validString),
-  start: validString,
-  end: validString,
-  limit: validNumber,
-  offset: validNumber,
-};
-export const validateActivityParams = (
-  activityValidators: SearchParamsValidator<ActivitySearchParams>
-) => {
-  return (search: Record<string, string>): ActivitySearchParams => {
-    const rawSearch = validateSearchParams(activityValidators)(search);
-    const limit = Number(rawSearch.limit ?? 10);
-    const offset = Number(rawSearch.offset ?? 0);
-    return {
-      ...rawSearch,
-      limit,
-      offset,
-    };
-  };
+export type ActivitySearchParams = InferSearch<typeof activityValidators>;
+export const activityValidators = {
+  actions: v.optional(validArrayOf(v.picklist(activityActions))),
+  ids: v.optional(validArrayOf(validString)),
+  pairs: v.optional(validArrayOf(validString)),
+  start: v.optional(validString),
+  end: v.optional(validString),
+  limit: v.optional(validNumberType, 10),
+  offset: v.optional(validNumberType, 0),
 };
+export const validateActivityParams = searchValidator(activityValidators);
 
 export const activityHasPairs = (activity: Activity, pairs: string[] = []) => {
   if (pairs.length === 0) return true;
diff --git a/src/components/core/menu/mainMenu/MainMenuLeft.tsx b/src/components/core/menu/mainMenu/MainMenuLeft.tsx
index ee9da19df..adbaffb34 100644
--- a/src/components/core/menu/mainMenu/MainMenuLeft.tsx
+++ b/src/components/core/menu/mainMenu/MainMenuLeft.tsx
@@ -37,9 +37,6 @@ export const MainMenuLeft: FC = () => {
               key={index}
               onClick={() => handleOnItemClick(href)}
               to={href}
-              // TODO: fix this
-              params={{}}
-              search={{}}
               aria-current={isSamePage ? 'page' : 'false'}
               data-testid={testid}
               className={`font-title px-3 py-3 transition-colors duration-300 ${
diff --git a/src/components/core/menu/mobileMenu/MobileMenu.tsx b/src/components/core/menu/mobileMenu/MobileMenu.tsx
index 5e74fc012..a1fa3d452 100644
--- a/src/components/core/menu/mobileMenu/MobileMenu.tsx
+++ b/src/components/core/menu/mobileMenu/MobileMenu.tsx
@@ -26,9 +26,6 @@ export const MobileMenu: FC = () => {
             key={index}
             onClick={() => handleOnItemClick(href)}
             to={href}
-            // TODO: fix this
-            params={{}}
-            search={{}}
             aria-current={isSamePage ? 'page' : 'false'}
             className={`px-3 py-3 ${
               isSamePage ? 'text-white' : 'hover:text-white'
diff --git a/src/components/explorer/ExplorerSearch.tsx b/src/components/explorer/ExplorerSearch.tsx
index 7b9fb0fae..8c021cce3 100644
--- a/src/components/explorer/ExplorerSearch.tsx
+++ b/src/components/explorer/ExplorerSearch.tsx
@@ -28,7 +28,7 @@ import { useDebouncedValue } from 'hooks/useDebouncedValue';
 export const _ExplorerSearch: FC = () => {
   const navigate = useNavigate();
   const pairs = usePairs();
-  const { type, slug } = useExplorerParams();
+  const { type, slug } = useExplorerParams('/explore/$type');
   const [search, setSearch] = useState(slug ?? '');
   const [debouncedSearch] = useDebouncedValue<string>(search, 300); // Debounce search input for ens query
 
diff --git a/src/components/explorer/ExplorerSearchDropdownButton.tsx b/src/components/explorer/ExplorerSearchDropdownButton.tsx
index b95b9dd8d..7d2482411 100644
--- a/src/components/explorer/ExplorerSearchDropdownButton.tsx
+++ b/src/components/explorer/ExplorerSearchDropdownButton.tsx
@@ -9,7 +9,7 @@ export const ExplorerSearchDropdownButton = forwardRef<
   HTMLButtonElement,
   MenuButtonProps
 >(function ExplorerSearchDropdownButton(props, ref) {
-  const { type } = useExplorerParams();
+  const { type } = useExplorerParams('/explore/$type');
   return (
     <button
       ref={ref}
diff --git a/src/components/explorer/ExplorerSearchDropdownItems.tsx b/src/components/explorer/ExplorerSearchDropdownItems.tsx
index 10379f1ec..75c4b5538 100644
--- a/src/components/explorer/ExplorerSearchDropdownItems.tsx
+++ b/src/components/explorer/ExplorerSearchDropdownItems.tsx
@@ -9,7 +9,7 @@ interface Props {
 }
 
 export const ExplorerSearchDropdownItems: FC<Props> = ({ setSearch }) => {
-  const { type: currentType } = useExplorerParams();
+  const { type: currentType } = useExplorerParams('/explore/$type');
   const items = [
     {
       type: 'wallet' as const,
diff --git a/src/components/explorer/ExplorerTabs.tsx b/src/components/explorer/ExplorerTabs.tsx
index 196e6c16c..b42554d08 100644
--- a/src/components/explorer/ExplorerTabs.tsx
+++ b/src/components/explorer/ExplorerTabs.tsx
@@ -12,7 +12,7 @@ import { useStrategyCtx } from 'hooks/useStrategies';
 
 export const ExplorerTabs = () => {
   const { filteredStrategies } = useStrategyCtx();
-  const { slug, type } = useExplorerParams();
+  const { slug, type } = useExplorerParams('/explore/$type/$slug');
 
   // To support emojis in ens domains
   const { location } = useRouterState();
diff --git a/src/components/explorer/suggestion/SuggestionList.tsx b/src/components/explorer/suggestion/SuggestionList.tsx
index b99a918d2..20c3971c7 100644
--- a/src/components/explorer/suggestion/SuggestionList.tsx
+++ b/src/components/explorer/suggestion/SuggestionList.tsx
@@ -29,7 +29,6 @@ export const SuggestionList: FC<Props> = (props) => {
             className="px-30 flex cursor-pointer items-center space-x-10 py-10  hover:bg-white/20 aria-selected:bg-white/10"
             to="/explore/$type/$slug"
             params={params}
-            search={{}}
           >
             <PairLogoName pair={pair} />
           </Link>
diff --git a/src/components/explorer/useExplorer.tsx b/src/components/explorer/useExplorer.tsx
index 12ab790c2..3ca1126c1 100644
--- a/src/components/explorer/useExplorer.tsx
+++ b/src/components/explorer/useExplorer.tsx
@@ -4,11 +4,11 @@ import { usePairs } from 'hooks/usePairs';
 import { useMemo } from 'react';
 
 export const useExplorer = () => {
-  const { slug, type } = useExplorerParams();
+  const { slug, type } = useExplorerParams('/explore/$type');
   const pairs = usePairs();
 
   // PAIR
-  const exactMatch = useMemo(() => pairs.map.get(slug), [pairs.map, slug]);
+  const exactMatch = useMemo(() => pairs.map.get(slug!), [pairs.map, slug]);
   const pairQuery = useGetPairStrategies({
     token0: exactMatch?.baseToken.address,
     token1: exactMatch?.quoteToken.address,
diff --git a/src/components/explorer/useExplorerParams.ts b/src/components/explorer/useExplorerParams.ts
index 57b75ef5a..6b16841e3 100644
--- a/src/components/explorer/useExplorerParams.ts
+++ b/src/components/explorer/useExplorerParams.ts
@@ -1,12 +1,18 @@
 import { useParams } from 'libs/routing';
 
-export const useExplorerParams = () => {
-  const params = useParams({
-    from: '/explore/$type/$slug/portfolio/token/$address',
-  });
+type ExplorerUrl =
+  | '/explore/$type'
+  | '/explore/$type/$slug'
+  | '/explore/$type/$slug/activity'
+  | '/explore/$type/$slug/portfolio'
+  | '/explore/$type/$slug/portfolio/token/$address';
 
-  // To support emojis in ens domains
-  const decodedSlug = params.slug && decodeURIComponent(params.slug);
-
-  return { ...params, slug: decodedSlug };
+export const useExplorerParams = <T extends ExplorerUrl>(url: T) => {
+  const params = useParams({ from: url });
+  if ('slug' in params) {
+    // To support emojis in ens domains
+    return { ...params, slug: decodeURIComponent(params.slug) };
+  } else {
+    return { ...params, slug: undefined };
+  }
 };
diff --git a/src/components/simulator/input/SimInputStrategyType.tsx b/src/components/simulator/input/SimInputStrategyType.tsx
index 9829953c8..6a23de373 100644
--- a/src/components/simulator/input/SimInputStrategyType.tsx
+++ b/src/components/simulator/input/SimInputStrategyType.tsx
@@ -45,51 +45,54 @@ export const SimInputStrategyType: FC<Props> = ({ baseToken, quoteToken }) => {
         <h2 className="text-18 font-weight-500 m-0">Trading Strategy</h2>
       </header>
       <article role="tablist" className="grid grid-cols-2 gap-8">
-        {items.map(({ title, label, svg, tooltipText }) => (
-          <Link
-            role="tab"
-            id={'tab-' + label}
-            aria-controls={'panel-' + label}
-            key={label}
-            to={`/simulate/${label}`}
-            search={{ baseToken, quoteToken }}
-            className={cn(
-              'rounded-10 text-14 font-weight-500 group flex size-full flex-row items-center justify-center gap-8 bg-black px-8 py-16 outline-white',
-              'md:px-12',
-              'focus-visible:outline focus-visible:outline-1'
-            )}
-            inactiveProps={{
-              className:
-                'hover:outline hover:outline-1 hover:outline-background-400',
-            }}
-            activeProps={{ className: 'outline outline-1 outline-white' }}
-            replace={true}
-            resetScroll={false}
-            params={{ simulationType: label }}
-            data-testid={`select-type-${label}`}
-          >
-            {({ isActive }) => {
-              return (
-                <>
-                  {svg}
-                  <span
-                    className={`capitalize ${
-                      isActive
-                        ? 'text-white'
-                        : 'text-white/40 group-hover:text-white/80'
-                    }`}
-                  >
-                    {title}
-                  </span>
-                  <Tooltip
-                    element={<div>{tooltipText}</div>}
-                    iconClassName="size-12 text-white/60"
-                  />
-                </>
-              );
-            }}
-          </Link>
-        ))}
+        {items.map(({ title, label, svg, tooltipText }) => {
+          const to = `/simulate/${label}` as const;
+          return (
+            <Link
+              role="tab"
+              id={'tab-' + label}
+              aria-controls={'panel-' + label}
+              key={label}
+              to={to}
+              search={{ baseToken, quoteToken }}
+              className={cn(
+                'rounded-10 text-14 font-weight-500 group flex size-full flex-row items-center justify-center gap-8 bg-black px-8 py-16 outline-white',
+                'md:px-12',
+                'focus-visible:outline focus-visible:outline-1'
+              )}
+              inactiveProps={{
+                className:
+                  'hover:outline hover:outline-1 hover:outline-background-400',
+              }}
+              activeProps={{ className: 'outline outline-1 outline-white' }}
+              replace={true}
+              resetScroll={false}
+              params={{ simulationType: label }}
+              data-testid={`select-type-${label}`}
+            >
+              {({ isActive }) => {
+                return (
+                  <>
+                    {svg}
+                    <span
+                      className={`capitalize ${
+                        isActive
+                          ? 'text-white'
+                          : 'text-white/40 group-hover:text-white/80'
+                      }`}
+                    >
+                      {title}
+                    </span>
+                    <Tooltip
+                      element={<div>{tooltipText}</div>}
+                      iconClassName="size-12 text-white/60"
+                    />
+                  </>
+                );
+              }}
+            </Link>
+          );
+        })}
       </article>
     </section>
   );
diff --git a/src/components/simulator/input/SimInputTokenSelection.tsx b/src/components/simulator/input/SimInputTokenSelection.tsx
index e9b53e963..b79564b47 100644
--- a/src/components/simulator/input/SimInputTokenSelection.tsx
+++ b/src/components/simulator/input/SimInputTokenSelection.tsx
@@ -19,7 +19,7 @@ export const SimInputTokenSelection: FC<Props> = ({
   quoteToken,
   noPriceHistory,
 }) => {
-  const navigate = useNavigate();
+  const navigate = useNavigate({ from: '/simulate' });
   const { openModal } = useModal();
   const { getTokenById } = useTokens();
   const base = getTokenById(baseToken);
diff --git a/src/components/strategies/StrategyPageTabs.tsx b/src/components/strategies/StrategyPageTabs.tsx
index d48cb500b..5289c1650 100644
--- a/src/components/strategies/StrategyPageTabs.tsx
+++ b/src/components/strategies/StrategyPageTabs.tsx
@@ -25,7 +25,7 @@ export const StrategyPageTabs = ({ currentPathname, tabs }: Props) => {
         const active = match({
           to: href,
           search: {},
-          params: params ?? {},
+          params: params,
           fuzzy:
             currentPathname.includes('/token/') && href.includes('portfolio'),
         });
@@ -33,9 +33,7 @@ export const StrategyPageTabs = ({ currentPathname, tabs }: Props) => {
         return (
           <Link
             to={href}
-            // TODO: fix this
-            params={params ?? {}}
-            search={{}}
+            params={params}
             key={href}
             className={cn(
               'flex w-full items-center justify-center gap-4 rounded-full py-5 md:px-10',
diff --git a/src/components/strategies/common/useSetOrder.ts b/src/components/strategies/common/useSetOrder.ts
index b5eb7d250..c906a9896 100644
--- a/src/components/strategies/common/useSetOrder.ts
+++ b/src/components/strategies/common/useSetOrder.ts
@@ -2,7 +2,8 @@ import { StrategyDirection, useNavigate } from 'libs/routing';
 import { OrderBlock } from './types';
 import { useCallback } from 'react';
 
-export const useSetDisposableOrder = (url: string) => {
+type DisposableUrl = '/strategies/edit/$strategyId/prices/disposable';
+export const useSetDisposableOrder = (url: DisposableUrl) => {
   const navigate = useNavigate({ from: url });
   const setOrder = useCallback(
     (order: Partial<OrderBlock>) => {
@@ -32,7 +33,12 @@ export const toOrderSearch = <T>(
   return search;
 };
 
-export const useSetRecurringOrder = <T>(url: string) => {
+type RecurringUrl =
+  | '/strategies/edit/$strategyId/budget/disposable'
+  | '/strategies/edit/$strategyId/budget/recurring'
+  | '/strategies/edit/$strategyId/prices/recurring'
+  | '/trade/recurring';
+export const useSetRecurringOrder = <T>(url: RecurringUrl) => {
   const navigate = useNavigate({ from: url });
   const setOrder = useCallback(
     (order: Partial<OrderBlock>, direction: StrategyDirection) => {
diff --git a/src/components/strategies/overview/strategyBlock/StrategyBlockManage.tsx b/src/components/strategies/overview/strategyBlock/StrategyBlockManage.tsx
index a87b7c71c..2aa0236f6 100644
--- a/src/components/strategies/overview/strategyBlock/StrategyBlockManage.tsx
+++ b/src/components/strategies/overview/strategyBlock/StrategyBlockManage.tsx
@@ -54,7 +54,7 @@ export const StrategyBlockManage: FC<Props> = (props) => {
   const { filteredStrategies, sort, filter } = useStrategyCtx();
   const { openModal } = useModal();
   const navigate = useNavigate();
-  const { type, slug } = useParams({ from: '/explore/$type/$slug' });
+  const { type, slug } = useParams({ strict: false });
 
   const isOwn = useIsStrategyOwner(strategy.id);
 
diff --git a/src/components/trade/TradeExplorerTabs.tsx b/src/components/trade/TradeExplorerTabs.tsx
index d81fa697f..3b11f407b 100644
--- a/src/components/trade/TradeExplorerTabs.tsx
+++ b/src/components/trade/TradeExplorerTabs.tsx
@@ -49,8 +49,6 @@ export const TradeExplorerTab: FC<Props> = ({ current }) => {
           id={id}
           key={key}
           to={href}
-          params={{}}
-          search={{}}
           resetScroll={false}
           className="flex w-full items-center justify-center gap-4 rounded-full py-5 aria-[current=location]:bg-white/10 md:px-10"
           aria-current={key === current ? 'location' : 'false'}
diff --git a/src/hooks/useList.tsx b/src/hooks/useList.tsx
deleted file mode 100644
index c85257bee..000000000
--- a/src/hooks/useList.tsx
+++ /dev/null
@@ -1,187 +0,0 @@
-import { FetchStatus } from '@tanstack/react-query';
-import { useNavigate, useSearch } from '@tanstack/react-router';
-import { useContext, createContext, useCallback, useEffect } from 'react';
-import {
-  GroupSchema,
-  parseSchema,
-  toLiteral,
-  toString,
-  toNumber,
-  SearchParams,
-} from 'utils/helpers';
-import { isEmpty } from 'utils/helpers/operators';
-
-export interface SortParams {
-  sortBy: string;
-  order: 'asc' | 'desc';
-}
-export interface PaginationParams {
-  limit: number;
-  offset: number;
-}
-
-const sortSchema = (
-  defaultSortBy: string,
-  defaultOrder: 'asc' | 'desc'
-): GroupSchema<SortParams> => ({
-  sortBy: toString(defaultSortBy),
-  order: toLiteral(['asc', 'desc'], defaultOrder),
-});
-const paginationSchema = (
-  defaultLimit: number,
-  defaultOffset: number
-): GroupSchema<PaginationParams> => ({
-  limit: toNumber(defaultLimit),
-  offset: toNumber(defaultOffset),
-});
-
-type ListParams<P> = P & SortParams & PaginationParams;
-
-interface ListContextType<T, P> {
-  status: FetchStatus;
-  all: T[];
-  list: T[];
-  size: number;
-  searchParams: ListParams<P>;
-  setSearchParams: (searchParams: Partial<ListParams<P>>) => any;
-}
-
-const ListContext = createContext<ListContextType<any, any>>({
-  status: 'idle',
-  all: [],
-  list: [],
-  size: 0,
-  searchParams: { limit: Infinity, offset: 0, sortBy: '', order: 'asc' },
-  setSearchParams: () => {},
-});
-
-export interface ListOptions<T, P> {
-  all: T[];
-  size: number;
-  status: FetchStatus;
-  schema: GroupSchema<P>;
-  defaultLimit?: number;
-  defaultOffset?: number;
-  filter?: (list: T[], searchParams: ListParams<P>) => T[];
-  sort?: (list: T[], sortBy: string, order: 'asc' | 'desc') => T[];
-}
-
-interface ListProviderProps<T, P> extends ListOptions<T, P> {
-  children: React.ReactNode;
-}
-
-export function ListProvider<T, P>(props: ListProviderProps<T, P>) {
-  const {
-    children,
-    all,
-    status,
-    schema,
-    defaultLimit = 10,
-    defaultOffset = 0,
-    filter = (list) => list,
-    sort = (list) => list,
-    size = all.length,
-  } = props;
-
-  // Get params from URL as string
-  const params: SearchParams<ListParams<P>> = useSearch({ strict: false });
-
-  // Parse and validate params
-  const searchParams = parseSchema<ListParams<P>>(
-    {
-      ...sortSchema('', 'asc'),
-      ...paginationSchema(defaultLimit, defaultOffset),
-      ...schema,
-    } as any,
-    params
-  );
-
-  const nav = useNavigate();
-  const setSearchParams = useCallback(
-    (changes: Partial<ListParams<P>>) => {
-      return nav({
-        replace: true,
-        resetScroll: false,
-        params: (params) => params,
-        search: (currentSearch) => {
-          const updates = structuredClone(changes);
-          const search = structuredClone(currentSearch);
-          for (const [key, value] of Object.entries(changes)) {
-            if (isEmpty(value)) {
-              delete (updates as any)[key];
-              if (key in search) delete (search as any)[key];
-            }
-          }
-          return { ...search, ...updates };
-        },
-      });
-    },
-    [nav]
-  );
-
-  // Filter, slice & sort the list
-  const { limit, offset, order, sortBy } = searchParams;
-  const filtered = filter(all, searchParams);
-  const sliced = filtered.slice(offset, offset + limit);
-  const sorted = sort(sliced, sortBy, order);
-
-  const ctx = {
-    all,
-    status,
-    list: sorted,
-    size: size ?? filtered.length,
-    searchParams,
-    setSearchParams,
-  };
-
-  return <ListContext.Provider value={ctx}>{children}</ListContext.Provider>;
-}
-
-export function useList<T = unknown, P = unknown>(): ListContextType<T, P> {
-  const ctx = useContext(ListContext) as any;
-  if (!ctx) {
-    throw new Error('useList/usePagination must be used within a ListProvider');
-  }
-  return ctx;
-}
-
-export function useSort() {
-  const { searchParams, setSearchParams } = useList();
-
-  return {
-    sortBy: searchParams.sortBy,
-    order: searchParams.order,
-    setSort: (sortBy: string) => setSearchParams({ sortBy }),
-    setOrder: (order: 'asc' | 'desc') => setSearchParams({ order }),
-  };
-}
-
-export function usePagination() {
-  const { size, searchParams, setSearchParams } = useList();
-  const { limit, offset } = searchParams;
-
-  const currentPage = Math.floor(offset / limit) + 1;
-  const maxPage = Math.ceil(size / limit);
-
-  const setLimit = (limit: number) => setSearchParams({ limit });
-  const setOffset = (offset: number) => setSearchParams({ offset });
-
-  // Remove offset when list size changes
-  useEffect(() => {
-    setSearchParams({ offset: undefined });
-  }, [size, setSearchParams]);
-
-  return {
-    size,
-    limit,
-    offset,
-    currentPage,
-    maxPage,
-    setLimit,
-    setOffset,
-    firstPage: () => setOffset(0),
-    lastPage: () => setOffset((maxPage - 1) * limit),
-    previousPage: () => setOffset(Math.max(offset - limit, 0)),
-    nextPage: () => setOffset(Math.min(offset + limit, (maxPage - 1) * limit)),
-  };
-}
diff --git a/src/hooks/useSimulatorOverlappingInput.ts b/src/hooks/useSimulatorOverlappingInput.ts
index e30fb9420..7783953f6 100644
--- a/src/hooks/useSimulatorOverlappingInput.ts
+++ b/src/hooks/useSimulatorOverlappingInput.ts
@@ -44,7 +44,7 @@ export interface SimulatorInputOverlappingValues {
 
 export const useSimulatorOverlappingInput = ({ searchState }: Props) => {
   const { getTokenById } = useTokens();
-  const navigate = useNavigate();
+  const navigate = useNavigate({ from: '/simulate/overlapping' });
   const [_state, setState] =
     useState<InternalSimulatorOverlappingInput>(searchState);
 
diff --git a/src/hooks/useStrategies.tsx b/src/hooks/useStrategies.tsx
index 6ce8499b6..1fe5ba1db 100644
--- a/src/hooks/useStrategies.tsx
+++ b/src/hooks/useStrategies.tsx
@@ -35,18 +35,16 @@ export const useStrategyFilter = (
   isPending: boolean
 ) => {
   const searchParams: Search = useSearch({ strict: false });
-  const navigate = useNavigate();
+  const navigate = useNavigate({ from: '/' });
   const search = searchParams.search || '';
 
   const setSearch = useCallback(
-    (value: string) => {
+    (search: string) => {
       navigate({
-        search: (currentSearch: MyStrategiesSearch) => {
-          return { ...currentSearch, search: value };
-        },
+        params: (params) => params,
+        search: () => ({ search }),
         replace: true,
         resetScroll: false,
-        params: (params) => params,
       });
     },
     [navigate]
diff --git a/src/hooks/useStrategyInput.ts b/src/hooks/useStrategyInput.ts
index 1772b3b18..32deb22df 100644
--- a/src/hooks/useStrategyInput.ts
+++ b/src/hooks/useStrategyInput.ts
@@ -45,7 +45,7 @@ interface Props {
 
 export const useStrategyInput = ({ searchState }: Props) => {
   const { getTokenById } = useTokens();
-  const navigate = useNavigate();
+  const navigate = useNavigate({ from: '/simulate/recurring' });
   const [_state, setState] = useState<InternalStrategyInput>(searchState);
 
   const baseToken = useMemo(
diff --git a/src/libs/routing/router.tsx b/src/libs/routing/router.tsx
index cbdfb7790..e792c6562 100644
--- a/src/libs/routing/router.tsx
+++ b/src/libs/routing/router.tsx
@@ -1,10 +1,8 @@
-import { Router } from '@tanstack/react-router';
+import { createRouter } from '@tanstack/react-router';
 import { routeTree } from 'libs/routing/routes';
-import { parseSearchWith } from 'libs/routing/utils';
 
-export const router = new Router({
+export const router = createRouter({
   routeTree,
-  parseSearch: parseSearchWith(JSON.parse),
 });
 
 declare module '@tanstack/react-router' {
diff --git a/src/libs/routing/routes/debug.ts b/src/libs/routing/routes/debug.ts
index 0d430db06..deb9d2789 100644
--- a/src/libs/routing/routes/debug.ts
+++ b/src/libs/routing/routes/debug.ts
@@ -1,8 +1,8 @@
-import { Route } from '@tanstack/react-router';
+import { createRoute } from '@tanstack/react-router';
 import { rootRoute } from 'libs/routing/routes/root';
 import { DebugPage } from 'pages/debug';
 
-export const debugPage = new Route({
+export const debugPage = createRoute({
   getParentRoute: () => rootRoute,
   path: '/debug',
   component: DebugPage,
diff --git a/src/libs/routing/routes/explorer.ts b/src/libs/routing/routes/explorer.ts
index e9cc35f63..62716c35d 100644
--- a/src/libs/routing/routes/explorer.ts
+++ b/src/libs/routing/routes/explorer.ts
@@ -1,4 +1,4 @@
-import { Route, redirect } from '@tanstack/react-router';
+import { createRoute, redirect } from '@tanstack/react-router';
 import { ExplorerType } from 'components/explorer/utils';
 import { rootRoute } from 'libs/routing/routes/root';
 import { ExplorerPage } from 'pages/explorer';
@@ -7,14 +7,13 @@ import { ExplorerActivityPage } from 'pages/explorer/type/activity';
 import { ExplorerTypeOverviewPage } from 'pages/explorer/type/overview';
 import { ExplorerTypePortfolioPage } from 'pages/explorer/type/portfolio';
 import { ExplorerTypePortfolioTokenPage } from 'pages/explorer/type/portfolio/token';
-import {
-  activityValidators,
-  validateActivityParams,
-} from 'components/activity/utils';
+import { validateActivityParams } from 'components/activity/utils';
+import { getLastVisitedPair } from '../utils';
+import { toPairSlug } from 'utils/pairSearch';
 
 // Used for redirecting old explorer route to new explorer route
 // TODO: remove this on May 2024
-export const oldExplorerLayout = new Route({
+export const oldExplorerLayout = createRoute({
   getParentRoute: () => rootRoute,
   path: '/explorer/*',
   beforeLoad: ({ params }) => {
@@ -27,70 +26,84 @@ export const oldExplorerLayout = new Route({
   },
 });
 
-export const explorerLayout = new Route({
+export const explorerLayout = createRoute({
   getParentRoute: () => rootRoute,
   path: '/explore',
 });
 
-export const explorerRedirect = new Route({
+export const explorerRedirect = createRoute({
   getParentRoute: () => explorerLayout,
   path: '/',
   beforeLoad: () => {
+    const { base, quote } = getLastVisitedPair();
+    const slug = toPairSlug({ address: base }, { address: quote });
     redirect({
-      to: '/explore/$type',
-      params: { type: 'token-pair' },
+      to: '/explore/$type/$slug',
+      params: { type: 'token-pair', slug },
       throw: true,
       replace: true,
     });
   },
 });
 
-export const explorerPage = new Route({
+export const explorerPage = createRoute({
   getParentRoute: () => explorerLayout,
   path: '$type',
+  component: ExplorerPage,
   parseParams: (params: Record<string, string>) => {
     return { type: params.type as ExplorerType };
   },
-  component: ExplorerPage,
+  beforeLoad: ({ location }) => {
+    if (location.pathname.endsWith('token-pair')) {
+      const { base, quote } = getLastVisitedPair();
+      const slug = toPairSlug({ address: base }, { address: quote });
+      redirect({
+        to: '/explore/$type/$slug',
+        params: { type: 'token-pair', slug },
+        throw: true,
+        replace: true,
+      });
+    }
+  },
 });
 
-export const explorerTypePage = new Route({
+export const explorerTypePage = createRoute({
   getParentRoute: () => explorerPage,
   path: '/',
   component: ExplorerTypePage,
 });
 
-export const explorerResultLayout = new Route({
+export const explorerResultLayout = createRoute({
   getParentRoute: () => explorerPage,
   path: '$slug',
 });
 
-export const explorerOverviewPage = new Route({
+export const explorerOverviewPage = createRoute({
   getParentRoute: () => explorerResultLayout,
   path: '/',
   component: ExplorerTypeOverviewPage,
 });
 
-export const explorerPortfolioLayout = new Route({
+export const explorerPortfolioLayout = createRoute({
   getParentRoute: () => explorerResultLayout,
   path: 'portfolio',
 });
 
-export const explorerPortfolioPage = new Route({
+export const explorerPortfolioPage = createRoute({
   getParentRoute: () => explorerPortfolioLayout,
   path: '/',
   component: ExplorerTypePortfolioPage,
 });
 
-export const explorerPortfolioTokenPage = new Route({
+export const explorerPortfolioTokenPage = createRoute({
   getParentRoute: () => explorerPortfolioLayout,
   path: 'token/$address',
   component: ExplorerTypePortfolioTokenPage,
 });
 
-export const explorerActivityPage = new Route({
+export const explorerActivityPage = createRoute({
   getParentRoute: () => explorerResultLayout,
   path: '/activity',
   component: ExplorerActivityPage,
-  validateSearch: validateActivityParams(activityValidators),
+  validateSearch: validateActivityParams,
 });
diff --git a/src/libs/routing/routes/legal.ts b/src/libs/routing/routes/legal.ts
index 6cd53653a..35ebaab9f 100644
--- a/src/libs/routing/routes/legal.ts
+++ b/src/libs/routing/routes/legal.ts
@@ -1,15 +1,15 @@
-import { Route } from '@tanstack/react-router';
+import { createRoute } from '@tanstack/react-router';
 import { rootRoute } from 'libs/routing/routes/root';
 import { PrivacyPage } from 'pages/privacy';
 import { TermsPage } from 'pages/terms';
 
-export const termPage = new Route({
+export const termPage = createRoute({
   getParentRoute: () => rootRoute,
   path: '/terms',
   component: TermsPage,
 });
 
-export const privacyPage = new Route({
+export const privacyPage = createRoute({
   getParentRoute: () => rootRoute,
   path: '/privacy',
   component: PrivacyPage,
diff --git a/src/libs/routing/routes/myStrategies.ts b/src/libs/routing/routes/myStrategies.ts
index 98fbc7836..82a715081 100644
--- a/src/libs/routing/routes/myStrategies.ts
+++ b/src/libs/routing/routes/myStrategies.ts
@@ -1,29 +1,27 @@
-import { Route, redirect } from '@tanstack/react-router';
-import {
-  activityValidators,
-  validateActivityParams,
-} from 'components/activity/utils';
+import { createRoute, redirect } from '@tanstack/react-router';
+import { validateActivityParams } from 'components/activity/utils';
 import { rootRoute } from 'libs/routing/routes/root';
 import { StrategiesPage } from 'pages/strategies';
 import { StrategiesActivityPage } from 'pages/strategies/activity';
 import { StrategiesOverviewPage } from 'pages/strategies/overview';
 import { StrategiesPortfolioPage } from 'pages/strategies/portfolio';
 import { StrategiesPortfolioTokenPage } from 'pages/strategies/portfolio/token';
-import { validString, validateSearchParams } from '../utils';
+import { searchValidator, validString } from '../utils';
 import { MyStrategiesSearch } from 'hooks/useStrategies';
+import * as v from 'valibot';
 
-export const myStrategyLayout = new Route({
+export const myStrategyLayout = createRoute({
   getParentRoute: () => rootRoute,
   id: 'my-strategy-layout',
   component: StrategiesPage,
 });
 
-export const strategyOverviewPage = new Route({
+export const strategyOverviewPage = createRoute({
   getParentRoute: () => myStrategyLayout,
   path: '/',
   component: StrategiesOverviewPage,
-  validateSearch: validateSearchParams<MyStrategiesSearch>({
-    search: validString,
+  validateSearch: searchValidator({
+    search: v.optional(validString),
   }),
   postSearchFilters: [
     (search: MyStrategiesSearch) => {
@@ -33,32 +31,32 @@ export const strategyOverviewPage = new Route({
   ],
 });
 
-export const strategyPortfolioLayout = new Route({
+export const strategyPortfolioLayout = createRoute({
   getParentRoute: () => myStrategyLayout,
   path: 'strategies/portfolio',
 });
 
-export const strategyPortfolioPage = new Route({
+export const strategyPortfolioPage = createRoute({
   getParentRoute: () => strategyPortfolioLayout,
   path: '/',
   component: StrategiesPortfolioPage,
 });
 
-export const strategyPortfolioTokenPage = new Route({
+export const strategyPortfolioTokenPage = createRoute({
   getParentRoute: () => strategyPortfolioLayout,
   path: 'token/$address',
   component: StrategiesPortfolioTokenPage,
 });
 
-export const strategyActivityPage = new Route({
+export const strategyActivityPage = createRoute({
   getParentRoute: () => myStrategyLayout,
   path: 'strategies/activity',
   component: StrategiesActivityPage,
-  validateSearch: validateActivityParams(activityValidators),
+  validateSearch: validateActivityParams,
 });
 
 // REDIRECT
-export const oldCreateStrategies = new Route({
+export const oldCreateStrategies = createRoute({
   getParentRoute: () => rootRoute,
   path: '/strategies/create/*',
   beforeLoad: ({ location, params }) => {
diff --git a/src/libs/routing/routes/root.ts b/src/libs/routing/routes/root.ts
index b310529da..ac540446b 100644
--- a/src/libs/routing/routes/root.ts
+++ b/src/libs/routing/routes/root.ts
@@ -1,6 +1,6 @@
-import { RootRoute } from '@tanstack/react-router';
+import { createRootRoute } from '@tanstack/react-router';
 import { App } from 'App';
 
-export const rootRoute = new RootRoute({
+export const rootRoute = createRootRoute({
   component: App,
 });
diff --git a/src/libs/routing/routes/sim.tsx b/src/libs/routing/routes/sim.tsx
index 145ca0ff1..40259bb5b 100644
--- a/src/libs/routing/routes/sim.tsx
+++ b/src/libs/routing/routes/sim.tsx
@@ -1,4 +1,4 @@
-import { redirect, Route } from '@tanstack/react-router';
+import { redirect, createRoute } from '@tanstack/react-router';
 import { SimulatorProvider } from 'components/simulator/result/SimulatorProvider';
 import { endOfDay, getUnixTime, startOfDay, sub } from 'date-fns';
 import { rootRoute } from 'libs/routing/routes/root';
@@ -16,7 +16,7 @@ import config from 'config';
 import { roundSearchParam } from 'utils/helpers';
 import * as v from 'valibot';
 
-export const simulatorRootRoute = new Route({
+export const simulatorRootRoute = createRoute({
   getParentRoute: () => rootRoute,
   path: '/simulate',
 });
@@ -28,7 +28,7 @@ export interface StrategyInputBase {
   end?: string;
 }
 
-export const simulatorInputRootRoute = new Route({
+export const simulatorInputRootRoute = createRoute({
   getParentRoute: () => simulatorRootRoute,
   path: '/',
   component: SimulatorPage,
@@ -91,7 +91,7 @@ export interface StrategyInputSearch extends StrategyInputBase {
 
 export type SimulatorType = 'overlapping' | 'recurring';
 
-export const simulatorInputRecurringRoute = new Route({
+export const simulatorInputRecurringRoute = createRoute({
   getParentRoute: () => simulatorInputRootRoute,
   path: 'recurring',
   component: SimulatorInputRecurringPage,
@@ -138,7 +138,7 @@ export interface SimulatorInputOverlappingSearch extends StrategyInputBase {
   spread?: string;
 }
 
-export const simulatorInputOverlappingRoute = new Route({
+export const simulatorInputOverlappingRoute = createRoute({
   getParentRoute: () => simulatorInputRootRoute,
   path: 'overlapping',
   component: SimulatorInputOverlappingPage,
@@ -168,7 +168,7 @@ export type SimulatorResultSearch = Required<StrategyInputSearch> & {
   spread?: string;
 };
 
-export const simulatorResultRoute = new Route({
+export const simulatorResultRoute = createRoute({
   getParentRoute: () => simulatorRootRoute,
   path: 'result',
   component: () => (
diff --git a/src/libs/routing/routes/strategy.ts b/src/libs/routing/routes/strategy.ts
index 913b93a73..8f637d6b7 100644
--- a/src/libs/routing/routes/strategy.ts
+++ b/src/libs/routing/routes/strategy.ts
@@ -1,25 +1,23 @@
 import { StrategyPage } from 'pages/strategy';
 import { rootRoute } from './root';
-import { Route } from '@tanstack/react-router';
-import { validBoolean, validNumber } from '../utils';
-import {
-  activityValidators,
-  validateActivityParams,
-} from 'components/activity/utils';
+import { createRoute } from '@tanstack/react-router';
+import { InferSearch, searchValidator, validNumber } from '../utils';
+import { activityValidators } from 'components/activity/utils';
 import { defaultEnd, defaultStart } from 'components/strategies/common/utils';
+import * as v from 'valibot';
 
-export const strategyPage = new Route({
+const schema = {
+  ...activityValidators,
+  priceStart: v.optional(validNumber, defaultStart().toString()),
+  priceEnd: v.optional(validNumber, defaultEnd().toString()),
+  hideIndicators: v.optional(v.boolean()),
+};
+
+export type StrategyPageSearch = InferSearch<typeof schema>;
+
+export const strategyPage = createRoute({
   getParentRoute: () => rootRoute,
   path: 'strategy/$id',
   component: StrategyPage,
-  beforeLoad: ({ search }) => {
-    search.priceStart ||= defaultStart().toString();
-    search.priceEnd ||= defaultEnd().toString();
-  },
-  validateSearch: validateActivityParams({
-    ...activityValidators,
-    priceStart: validNumber,
-    priceEnd: validNumber,
-    hideIndicators: validBoolean,
-  }),
+  validateSearch: searchValidator(schema),
 });
diff --git a/src/libs/routing/routes/strategyEdit.ts b/src/libs/routing/routes/strategyEdit.ts
index e577b3521..d4980daa7 100644
--- a/src/libs/routing/routes/strategyEdit.ts
+++ b/src/libs/routing/routes/strategyEdit.ts
@@ -1,11 +1,10 @@
-import { Route } from '@tanstack/react-router';
+import { createRoute } from '@tanstack/react-router';
 import { rootRoute } from 'libs/routing/routes/root';
 import {
-  validLiteral,
+  searchValidator,
   validMarginalPrice,
   validNumber,
   validPositiveNumber,
-  validateSearchParams,
 } from '../utils';
 import { EditStrategyPageLayout } from 'pages/strategies/edit/layout';
 import {
@@ -29,27 +28,23 @@ import {
   EditOverlappingStrategySearch,
   EditStrategyOverlappingPage,
 } from 'pages/strategies/edit/prices/overlapping';
-import {
-  EditBudgetRecurringPage,
-  EditBudgetRecurringStrategySearch,
-} from 'pages/strategies/edit/budget/recurring';
-import {
-  EditBudgetDisposablePage,
-  EditBudgetDisposableStrategySearch,
-} from 'pages/strategies/edit/budget/disposable';
-import {
-  EditBudgetOverlappingPage,
-  EditBudgetOverlappingSearch,
-} from 'pages/strategies/edit/budget/overlapping';
+import { EditBudgetRecurringPage } from 'pages/strategies/edit/budget/recurring';
+import { EditBudgetDisposablePage } from 'pages/strategies/edit/budget/disposable';
+import { EditBudgetOverlappingPage } from 'pages/strategies/edit/budget/overlapping';
 import { SafeDecimal } from 'libs/safedecimal';
+import * as v from 'valibot';
 
 export type EditTypes = 'renew' | 'editPrices' | 'deposit' | 'withdraw';
 
-export const editStrategyLayout = new Route({
+export const editStrategyLayout = createRoute({
   getParentRoute: () => rootRoute,
   path: '/strategies/edit/$strategyId',
   component: EditStrategyPageLayout,
-  validateSearch: (search: { editType: EditTypes }) => search,
+  validateSearch: searchValidator({
+    priceStart: v.optional(validNumber, defaultStart().toString()),
+    priceEnd: v.optional(validNumber, defaultEnd().toString()),
+    editType: v.picklist(['editPrices', 'renew', 'deposit', 'withdraw']),
+  }),
 });
 
 // PRICES
@@ -73,24 +68,18 @@ export const toDisposablePricesSearch = (
     direction,
   };
 };
-export const editPricesDisposable = new Route({
+export const editPricesDisposable = createRoute({
   getParentRoute: () => editStrategyLayout,
   path: 'prices/disposable',
   component: EditStrategyDisposablePage,
-  beforeLoad: ({ search }) => {
-    search.priceStart ||= defaultStart().toString();
-    search.priceEnd ||= defaultEnd().toString();
-  },
-  validateSearch: validateSearchParams<EditDisposableStrategySearch>({
-    priceStart: validNumber,
-    priceEnd: validNumber,
-    editType: validLiteral(['editPrices', 'renew']),
-    min: validPositiveNumber,
-    max: validPositiveNumber,
-    budget: validPositiveNumber,
-    settings: validLiteral(['limit', 'range']),
-    direction: validLiteral(['buy', 'sell']),
-    action: validLiteral(['deposit', 'withdraw']),
+  validateSearch: searchValidator({
+    editType: v.picklist(['editPrices', 'renew']),
+    min: v.optional(validPositiveNumber),
+    max: v.optional(validPositiveNumber),
+    budget: v.optional(validPositiveNumber),
+    settings: v.optional(v.picklist(['limit', 'range'])),
+    direction: v.optional(v.picklist(['buy', 'sell'])),
+    action: v.optional(v.picklist(['deposit', 'withdraw'])),
   }),
 });
 
@@ -109,28 +98,22 @@ export const toRecurringPricesSearch = (
     sellSettings: sell.startRate === sell.endRate ? 'limit' : 'range',
   };
 };
-export const editPricesRecurring = new Route({
+export const editPricesRecurring = createRoute({
   getParentRoute: () => editStrategyLayout,
   path: 'prices/recurring',
   component: EditStrategyRecurringPage,
-  beforeLoad: ({ search }) => {
-    search.priceStart ||= defaultStart().toString();
-    search.priceEnd ||= defaultEnd().toString();
-  },
-  validateSearch: validateSearchParams<EditRecurringStrategySearch>({
-    priceStart: validNumber,
-    priceEnd: validNumber,
-    editType: validLiteral(['editPrices', 'renew']),
-    buyMin: validPositiveNumber,
-    buyMax: validPositiveNumber,
-    buyBudget: validPositiveNumber,
-    buySettings: validLiteral(['limit', 'range']),
-    buyAction: validLiteral(['deposit', 'withdraw']),
-    sellMin: validPositiveNumber,
-    sellMax: validPositiveNumber,
-    sellBudget: validPositiveNumber,
-    sellSettings: validLiteral(['limit', 'range']),
-    sellAction: validLiteral(['deposit', 'withdraw']),
+  validateSearch: searchValidator({
+    editType: v.picklist(['editPrices', 'renew']),
+    buyMin: v.optional(validPositiveNumber),
+    buyMax: v.optional(validPositiveNumber),
+    buyBudget: v.optional(validPositiveNumber),
+    buySettings: v.optional(v.picklist(['limit', 'range'])),
+    buyAction: v.optional(v.picklist(['deposit', 'withdraw'])),
+    sellMin: v.optional(validPositiveNumber),
+    sellMax: v.optional(validPositiveNumber),
+    sellBudget: v.optional(validPositiveNumber),
+    sellSettings: v.optional(v.picklist(['limit', 'range'])),
+    sellAction: v.optional(v.picklist(['deposit', 'withdraw'])),
   }),
 });
 
@@ -157,69 +140,51 @@ export const toOverlappingPricesSearch = (
     spread: spread ? spread.toString() : undefined,
   };
 };
-export const editPricesOverlapping = new Route({
+export const editPricesOverlapping = createRoute({
   getParentRoute: () => editStrategyLayout,
   path: 'prices/overlapping',
   component: EditStrategyOverlappingPage,
-  beforeLoad: ({ search }) => {
-    search.priceStart ||= defaultStart().toString();
-    search.priceEnd ||= defaultEnd().toString();
-  },
-  validateSearch: validateSearchParams<EditOverlappingStrategySearch>({
-    priceStart: validNumber,
-    priceEnd: validNumber,
-    editType: validLiteral(['editPrices', 'renew']),
-    chartType: validLiteral(['history', 'range']),
-    marketPrice: validNumber,
-    min: validPositiveNumber,
-    max: validPositiveNumber,
-    spread: validNumber,
-    budget: validNumber,
-    anchor: validLiteral(['buy', 'sell']),
-    action: validLiteral(['deposit', 'withdraw']),
+  validateSearch: searchValidator({
+    editType: v.picklist(['editPrices', 'renew']),
+    chartType: v.optional(v.picklist(['history', 'range'])),
+    marketPrice: v.optional(validNumber),
+    min: v.optional(validPositiveNumber),
+    max: v.optional(validPositiveNumber),
+    spread: v.optional(validNumber),
+    budget: v.optional(validNumber),
+    anchor: v.optional(v.picklist(['buy', 'sell'])),
+    action: v.optional(v.picklist(['deposit', 'withdraw'])),
   }),
 });
 
 // BUDGET
-export const editBudgetDisposable = new Route({
+export const editBudgetDisposable = createRoute({
   getParentRoute: () => editStrategyLayout,
   path: 'budget/disposable',
   component: EditBudgetDisposablePage,
-  beforeLoad: ({ search }) => {
-    search.priceStart ||= defaultStart().toString();
-    search.priceEnd ||= defaultEnd().toString();
-  },
-  validateSearch: validateSearchParams<EditBudgetDisposableStrategySearch>({
-    priceStart: validNumber,
-    priceEnd: validNumber,
-    editType: validLiteral(['deposit', 'withdraw']),
-    buyBudget: validNumber,
-    sellBudget: validNumber,
-    buyMarginalPrice: validMarginalPrice,
-    sellMarginalPrice: validMarginalPrice,
+  validateSearch: searchValidator({
+    editType: v.picklist(['deposit', 'withdraw']),
+    buyBudget: v.optional(validNumber),
+    sellBudget: v.optional(validNumber),
+    buyMarginalPrice: v.optional(validMarginalPrice),
+    sellMarginalPrice: v.optional(validMarginalPrice),
   }),
 });
 
-export const editBudgetRecurring = new Route({
+export const editBudgetRecurring = createRoute({
   getParentRoute: () => editStrategyLayout,
   path: 'budget/recurring',
   component: EditBudgetRecurringPage,
-  beforeLoad: ({ search }) => {
-    search.priceStart ||= defaultStart().toString();
-    search.priceEnd ||= defaultEnd().toString();
-  },
-  validateSearch: validateSearchParams<EditBudgetRecurringStrategySearch>({
-    priceStart: validNumber,
-    priceEnd: validNumber,
-    editType: validLiteral(['deposit', 'withdraw']),
-    buyBudget: validNumber,
-    buyMarginalPrice: validMarginalPrice,
-    sellBudget: validNumber,
-    sellMarginalPrice: validMarginalPrice,
+  validateSearch: searchValidator({
+    editType: v.picklist(['deposit', 'withdraw']),
+    buyBudget: v.optional(validNumber),
+    buyMarginalPrice: v.optional(validMarginalPrice),
+    sellBudget: v.optional(validNumber),
+    sellMarginalPrice: v.optional(validMarginalPrice),
   }),
 });
 
-export const editBudgetOverlapping = new Route({
+export const editBudgetOverlapping = createRoute({
   getParentRoute: () => editStrategyLayout,
   path: 'budget/overlapping',
   component: EditBudgetOverlappingPage,
@@ -227,13 +192,11 @@ export const editBudgetOverlapping = new Route({
     search.priceStart ||= defaultStart().toString();
     search.priceEnd ||= defaultEnd().toString();
   },
-  validateSearch: validateSearchParams<EditBudgetOverlappingSearch>({
-    priceStart: validNumber,
-    priceEnd: validNumber,
-    editType: validLiteral(['deposit', 'withdraw']),
-    chartType: validLiteral(['history', 'range']),
-    marketPrice: validNumber,
-    budget: validNumber,
-    anchor: validLiteral(['buy', 'sell']),
+  validateSearch: searchValidator({
+    editType: v.picklist(['deposit', 'withdraw']),
+    chartType: v.optional(v.picklist(['history', 'range'])),
+    marketPrice: v.optional(validNumber),
+    budget: v.optional(validNumber),
+    anchor: v.optional(v.picklist(['buy', 'sell'])),
   }),
 });
diff --git a/src/libs/routing/routes/trade.ts b/src/libs/routing/routes/trade.ts
index b3629755f..92372b90e 100644
--- a/src/libs/routing/routes/trade.ts
+++ b/src/libs/routing/routes/trade.ts
@@ -1,11 +1,10 @@
-import { Route, redirect } from '@tanstack/react-router';
+import { createRoute, redirect } from '@tanstack/react-router';
 import { rootRoute } from 'libs/routing/routes/root';
 import {
+  searchValidator,
   validAddress,
-  validLiteral,
   validNumber,
   validPositiveNumber,
-  validateSearchParams,
 } from '../utils';
 import { TradeDisposable } from 'pages/trade/disposable';
 import { TradeRoot } from 'pages/trade/root';
@@ -14,6 +13,7 @@ import { TradeRecurring } from 'pages/trade/recurring';
 import { TradeOverlapping } from 'pages/trade/overlapping';
 import { defaultEnd, defaultStart } from 'components/strategies/common/utils';
 import { OverlappingSearch } from 'components/strategies/common/types';
+import * as v from 'valibot';
 
 // TRADE TYPE
 export type StrategyType = 'recurring' | 'disposable' | 'overlapping';
@@ -62,85 +62,73 @@ export interface TradeSearch {
   priceStart?: string;
   priceEnd?: string;
 }
-const tradePage = new Route({
+const tradePage = createRoute({
   getParentRoute: () => rootRoute,
   path: '/trade',
   component: TradeRoot,
   beforeLoad: ({ location, search }) => {
-    (search as TradeSearch).priceStart ||= defaultStart().toString();
-    (search as TradeSearch).priceEnd ||= defaultEnd().toString();
     if (location.pathname.endsWith('trade')) {
       throw redirect({ to: '/trade/disposable', search });
     }
   },
+  validateSearch: searchValidator({
+    base: v.optional(validAddress),
+    quote: v.optional(validAddress),
+    priceStart: v.optional(validNumber, defaultStart().toString()),
+    priceEnd: v.optional(validNumber, defaultEnd().toString()),
+  }),
 });
 
-const marketPage = new Route({
+const marketPage = createRoute({
   getParentRoute: () => tradePage,
   path: '/market',
   component: TradeMarket,
-  validateSearch: validateSearchParams<TradeMarketSearch>({
-    base: validAddress,
-    quote: validAddress,
-    priceStart: validNumber,
-    priceEnd: validNumber,
-    direction: validLiteral(['buy', 'sell']),
+  validateSearch: searchValidator({
+    direction: v.optional(v.picklist(['buy', 'sell'])),
   }),
 });
 
-const disposablePage = new Route({
+const disposablePage = createRoute({
   getParentRoute: () => tradePage,
   path: '/disposable',
   component: TradeDisposable,
-  validateSearch: validateSearchParams<TradeDisposableSearch>({
-    base: validAddress,
-    quote: validAddress,
-    priceStart: validNumber,
-    priceEnd: validNumber,
-    direction: validLiteral(['buy', 'sell']),
-    settings: validLiteral(['limit', 'range']),
-    min: validPositiveNumber,
-    max: validPositiveNumber,
-    budget: validPositiveNumber,
+  validateSearch: searchValidator({
+    direction: v.optional(v.picklist(['buy', 'sell'])),
+    settings: v.optional(v.picklist(['limit', 'range'])),
+    min: v.optional(validPositiveNumber),
+    max: v.optional(validPositiveNumber),
+    budget: v.optional(validPositiveNumber),
   }),
 });
 
-const recurringPage = new Route({
+const recurringPage = createRoute({
   getParentRoute: () => tradePage,
   path: '/recurring',
   component: TradeRecurring,
-  validateSearch: validateSearchParams<TradeRecurringSearch>({
-    base: validAddress,
-    quote: validAddress,
-    priceStart: validNumber,
-    priceEnd: validNumber,
-    buyMin: validPositiveNumber,
-    buyMax: validPositiveNumber,
-    buyBudget: validPositiveNumber,
-    buySettings: validLiteral(['limit', 'range']),
-    sellMin: validPositiveNumber,
-    sellMax: validPositiveNumber,
-    sellBudget: validPositiveNumber,
-    sellSettings: validLiteral(['limit', 'range']),
+  validateSearch: searchValidator({
+    buyMin: v.optional(validPositiveNumber),
+    buyMax: v.optional(validPositiveNumber),
+    buyBudget: v.optional(validPositiveNumber),
+    buySettings: v.optional(v.picklist(['limit', 'range'])),
+    sellMin: v.optional(validPositiveNumber),
+    sellMax: v.optional(validPositiveNumber),
+    sellBudget: v.optional(validPositiveNumber),
+    sellSettings: v.optional(v.picklist(['limit', 'range'])),
   }),
 });
 
-const overlappingPage = new Route({
+const overlappingPage = createRoute({
   getParentRoute: () => tradePage,
   path: '/overlapping',
   component: TradeOverlapping,
-  validateSearch: validateSearchParams<TradeOverlappingSearch>({
-    base: validAddress,
-    quote: validAddress,
-    priceStart: validNumber,
-    priceEnd: validNumber,
-    marketPrice: validNumber,
-    min: validPositiveNumber,
-    max: validPositiveNumber,
-    spread: validNumber,
-    budget: validNumber,
-    anchor: validLiteral(['buy', 'sell']),
-    chartType: validLiteral(['history', 'range']),
+  validateSearch: searchValidator({
+    marketPrice: v.optional(validNumber),
+    min: v.optional(validPositiveNumber),
+    max: v.optional(validPositiveNumber),
+    spread: v.optional(validNumber),
+    budget: v.optional(validNumber),
+    anchor: v.optional(v.picklist(['buy', 'sell'])),
+    chartType: v.optional(v.picklist(['history', 'range'])),
   }),
 });
 
diff --git a/src/libs/routing/utils.test.ts b/src/libs/routing/utils.test.ts
deleted file mode 100644
index c07c63d3b..000000000
--- a/src/libs/routing/utils.test.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { parseSearchWith } from './utils';
-import { describe, it, expect } from 'vitest';
-
-describe('parseSearchWith', () => {
-  const parser = parseSearchWith(JSON.parse);
-  it('should parse number to string and string numbers to double string', () => {
-    const url =
-      "?number1=1&number2=0.2&number3=0.1&number4='1'&number5='0.2'&number6='0.1'&number7='.'&number8=.";
-    const queryKeys = parser(url);
-
-    expect(queryKeys).toStrictEqual({
-      number1: '1',
-      number2: '0.2',
-      number3: '0.1',
-      number4: "'1'",
-      number5: "'0.2'",
-      number6: "'0.1'",
-      number7: "'.'",
-      number8: '.',
-    });
-  });
-  it('should parse non-number strings to string', () => {
-    const url = "?string1=hello&string2='hello'";
-    const queryKeys = parser(url);
-
-    expect(queryKeys).toStrictEqual({
-      string1: 'hello',
-      string2: "'hello'",
-    });
-  });
-});
diff --git a/src/libs/routing/utils.ts b/src/libs/routing/utils.ts
index 6a2430476..ad88c4b3b 100644
--- a/src/libs/routing/utils.ts
+++ b/src/libs/routing/utils.ts
@@ -1,100 +1,10 @@
 import { lsService } from 'services/localeStorage';
-import config from 'config';
 import { utils } from 'ethers';
-import * as v from 'valibot';
 import { formatNumber } from 'utils/helpers';
 import { MarginalPriceOptions } from '@bancor/carbon-sdk/strategy-management';
-import { isAddress } from 'ethers/lib/utils';
-
-function toValue(mix: string | undefined) {
-  if (!mix) return '';
-  var str = decodeURIComponent(mix);
-  if (str === 'false') return false;
-  if (str === 'true') return true;
-  if (str.startsWith('0x')) return str;
-  if (str.startsWith('0X')) return str;
-  return +str * 0 === 0 && +str + '' === str ? str : str;
-}
-
-export function decode(str: string) {
-  let tmp,
-    k,
-    out: any = {},
-    arr = str.split('&');
-
-  while ((tmp = arr.shift())) {
-    tmp = tmp.split('=');
-    k = tmp.shift();
-    if (k && out[k] !== void 0) {
-      // @ts-ignore
-      out[k] = [].concat(out[k], toValue(tmp.shift()));
-    } else {
-      // @ts-ignore
-      out[k] = toValue(tmp.shift());
-    }
-  }
-
-  return out;
-}
-
-const isDate = (date: string) => {
-  const regex = /^\d{4}-\d{2}-\d{2}$/;
-  return regex.test(date);
-};
-
-export const parseSearchWith = (parser: (str: string) => any) => {
-  return (searchStr: string): Record<string, any> => {
-    if (searchStr.substring(0, 1) === '?') {
-      searchStr = searchStr.substring(1);
-    }
-
-    let query: Record<string, unknown> = decode(searchStr);
-
-    const keysToSkipParse = [
-      'settings',
-      'type',
-      'anchor',
-      'direction',
-      'buySettings',
-      'sellSettings',
-      'editType',
-      'action',
-      'buyAction',
-      'sellAction',
-      'chartType',
-    ];
-
-    const skipParsing = (key: string) => keysToSkipParse.includes(key);
-
-    const formatNumberParam = (value: string): string => {
-      const number = /^\d*\.*\d*$/;
-      if (value.match(number)) return `"${value}"`;
-      return value;
-    };
-
-    // Try to parse any query params that might be json
-    for (let key in query) {
-      if (
-        !query[key] ||
-        isAddress(String(query[key])) ||
-        isDate(String(query[key])) ||
-        skipParsing(key)
-      )
-        continue;
-
-      const value = query[key];
-      if (typeof value === 'string') {
-        try {
-          query[key] = parser(formatNumberParam(value));
-        } catch (err) {
-          //
-        }
-      }
-    }
-
-    return query;
-  };
-};
+import { valibotSearchValidator } from '@tanstack/router-valibot-adapter';
+import * as v from 'valibot';
+import config from 'config';
 
 export const getLastVisitedPair = () => {
   const [base, quote] =
@@ -109,19 +19,15 @@ export type SearchParamsValidator<T> = {
   [key in keyof T]: v.GenericSchema<any, any>;
 };
 
-export const validArrayOf = (schema: v.GenericSchema<string, any>) => {
+export const validArrayOf = <T>(schema: v.GenericSchema<string, T>) => {
   return v.array(schema);
 };
 
-export const validLiteral = (array: string[]) => {
-  return v.union(array.map((l) => v.literal(l)));
-};
-
 export const validNumber = v.pipe(
   v.string(),
   v.check((value: string) => isNaN(Number(formatNumber(value))) === false)
 );
-export const validPositiveNumber = v.fallback(
+export const validPositiveNumber = v.optional(
   v.pipe(
     validNumber,
     v.check((value: string) => Number(value) >= 0)
@@ -152,21 +58,13 @@ export const validBoolean = v.pipe(
 
 export const validMarginalPrice = v.union([
   validNumber,
-  validLiteral([MarginalPriceOptions.maintain, MarginalPriceOptions.reset]),
+  v.picklist([MarginalPriceOptions.maintain, MarginalPriceOptions.reset]),
 ]);
 
-export const validateSearchParams = <T>(
-  validator: SearchParamsValidator<T>
-) => {
-  return (search: Record<string, string>): T => {
-    for (const key in search) {
-      const schema = validator[key as keyof T];
-      if (schema && v.is(schema, search[key])) {
-        search[key] = v.parse(schema, search[key]);
-      } else {
-        delete search[key];
-      }
-    }
-    return search as T;
-  };
+export type InferSearch<T extends v.ObjectEntries> = v.InferOutput<
+  v.ObjectSchema<T, undefined>
+>;
+
+export const searchValidator = <T extends v.ObjectEntries>(validators: T) => {
+  return valibotSearchValidator(v.object(validators));
 };
diff --git a/src/libs/testing-library/index.tsx b/src/libs/testing-library/index.tsx
index 58f350b71..04740a518 100644
--- a/src/libs/testing-library/index.tsx
+++ b/src/libs/testing-library/index.tsx
@@ -65,7 +65,9 @@ export const renderWithProviders = (
 export const renderWithRouter = async (params: RouterRenderParams) => {
   const customRouter = await loadRouter(params);
   return {
-    container: renderWithProviders(<RouterProvider router={customRouter} />),
+    container: renderWithProviders(
+      <RouterProvider router={customRouter as any} />
+    ),
     router: customRouter,
   };
 };
diff --git a/src/libs/testing-library/utils/routing.ts b/src/libs/testing-library/utils/routing.ts
index bde569a00..f155efe90 100644
--- a/src/libs/testing-library/utils/routing.ts
+++ b/src/libs/testing-library/utils/routing.ts
@@ -1,11 +1,11 @@
 import {
-  RootRoute,
-  Route,
-  Router,
   createMemoryHistory,
+  createRootRoute,
+  createRoute,
+  createRouter,
+  Outlet,
 } from '@tanstack/react-router';
 import { RouterRenderParams } from './types';
-import { parseSearchWith } from 'libs/routing/utils';
 import { isAddress } from 'ethers/lib/utils';
 
 const encodeValue = (value: string | number | symbol) => {
@@ -49,19 +49,26 @@ export const loadRouter = async ({
   search = {},
   params = {},
 }: RouterRenderParams) => {
-  const rootRoute = new RootRoute();
+  const rootRoute = createRootRoute();
   const subPath = encodeParams(search);
   const path = `${replaceParams(basePath, params)}?${subPath}`;
 
-  const componentRoute = new Route({
-    getParentRoute: () => rootRoute,
-    path: basePath,
-    component,
-  });
+  const routes: ReturnType<typeof createRoute>[] = [];
+  const paths = basePath.split('/');
+  for (let i = 0; i < paths.length; i++) {
+    const currentPath = paths[i] || '/';
+    const parent = routes.at(-1) ?? rootRoute;
+    const route: ReturnType<typeof createRoute> = createRoute({
+      getParentRoute: () => parent,
+      path: currentPath,
+      component: i === paths.length - 1 ? component : Outlet,
+    });
+    parent.addChildren([route]);
+    routes.push(route);
+  }
 
-  const customRouter = new Router({
-    routeTree: rootRoute.addChildren([componentRoute]),
-    parseSearch: parseSearchWith(JSON.parse),
+  const customRouter = createRouter({
+    routeTree: rootRoute,
     history: createMemoryHistory({ initialEntries: [path] }),
   });
 
diff --git a/src/pages/explorer/index.tsx b/src/pages/explorer/index.tsx
index b1654aad9..69230173a 100644
--- a/src/pages/explorer/index.tsx
+++ b/src/pages/explorer/index.tsx
@@ -1,10 +1,5 @@
 import { Page } from 'components/common/page';
-import {
-  Outlet,
-  Navigate,
-  useNavigate,
-  getLastVisitedPair,
-} from 'libs/routing';
+import { Outlet, Navigate, useNavigate } from 'libs/routing';
 import {
   ExplorerSearch,
   useExplorer,
@@ -14,12 +9,12 @@ import { StrategyProvider, useStrategyCtx } from 'hooks/useStrategies';
 import { ExplorerTabs } from 'components/explorer/ExplorerTabs';
 import { useEffect, useState } from 'react';
 import { explorerEvents } from 'services/events/explorerEvents';
-import { toPairSlug } from 'utils/pairSearch';
 import { lsService } from 'services/localeStorage';
 
+const url = '/explore/$type';
 export const ExplorerPage = () => {
-  const { slug, type } = useExplorerParams();
-  const navigate = useNavigate({ from: '/explore/$type/$slug' });
+  const { slug, type } = useExplorerParams(url);
+  const navigate = useNavigate({ from: url });
 
   useEffect(() => {
     if (slug && type === 'token-pair') {
@@ -28,18 +23,6 @@ export const ExplorerPage = () => {
       lsService.setItem('tradePair', [base, quote]);
       return;
     }
-    if (slug || type !== 'token-pair') return;
-    const defaultPair = getLastVisitedPair();
-    const defaultSlug = toPairSlug(
-      { address: defaultPair.base },
-      { address: defaultPair.quote }
-    );
-
-    navigate({
-      to: '/explore/$type/$slug',
-      params: { type, slug: defaultSlug },
-      replace: true,
-    });
   }, [slug, navigate, type]);
 
   const query = useExplorer();
@@ -63,7 +46,7 @@ export const ExplorerPage = () => {
 
 const ExplorerEvents = () => {
   const [mounted, setMounted] = useState(false);
-  const { slug, type } = useExplorerParams();
+  const { slug, type } = useExplorerParams(url);
   const { filteredStrategies, isPending, filter, sort } = useStrategyCtx();
 
   useEffect(() => {
diff --git a/src/pages/explorer/type/activity/index.tsx b/src/pages/explorer/type/activity/index.tsx
index ff036bb71..272d11ff2 100644
--- a/src/pages/explorer/type/activity/index.tsx
+++ b/src/pages/explorer/type/activity/index.tsx
@@ -4,7 +4,7 @@ import { useExplorerParams } from 'components/explorer';
 import { QueryActivityParams } from 'libs/queries/extApi/activity';
 
 export const ExplorerActivityPage = () => {
-  const { type, slug } = useExplorerParams();
+  const { type, slug } = useExplorerParams('/explore/$type/$slug/activity');
   const params: QueryActivityParams = {};
   if (type === 'wallet') params.ownerId = slug;
   if (type === 'token-pair') {
@@ -13,7 +13,7 @@ export const ExplorerActivityPage = () => {
     params.token1 = quote;
   }
   return (
-    <ActivityProvider params={params}>
+    <ActivityProvider params={params} url="/explore/$type/$slug/activity">
       <ActivityLayout
         filters={type === 'wallet' ? ['ids', 'pairs'] : ['ids']}
       />
diff --git a/src/pages/explorer/type/portfolio/index.tsx b/src/pages/explorer/type/portfolio/index.tsx
index 9a8098cdc..ccc6bcbbd 100644
--- a/src/pages/explorer/type/portfolio/index.tsx
+++ b/src/pages/explorer/type/portfolio/index.tsx
@@ -8,7 +8,7 @@ import { GetPortfolioTokenHref } from 'components/strategies/portfolio/types';
 
 export const ExplorerTypePortfolioPage = () => {
   const navigate = useNavigate();
-  const { type, slug } = useExplorerParams();
+  const { type, slug } = useExplorerParams('/explore/$type/$slug/portfolio');
   const { strategies, isPending } = useStrategyCtx();
   const href = '/explore/$type/$slug/portfolio/token/$address';
 
diff --git a/src/pages/explorer/type/portfolio/token/index.tsx b/src/pages/explorer/type/portfolio/token/index.tsx
index fef4d2c07..9591f586f 100644
--- a/src/pages/explorer/type/portfolio/token/index.tsx
+++ b/src/pages/explorer/type/portfolio/token/index.tsx
@@ -2,8 +2,9 @@ import { PortfolioToken } from 'components/strategies/portfolio';
 import { useExplorerParams } from 'components/explorer/useExplorerParams';
 import { useStrategyCtx } from 'hooks/useStrategies';
 
+const url = '/explore/$type/$slug/portfolio/token/$address';
 export const ExplorerTypePortfolioTokenPage = () => {
-  const { address, type, slug } = useExplorerParams();
+  const { address, type, slug } = useExplorerParams(url);
   const { strategies, isPending } = useStrategyCtx();
 
   if (!address) return <div>error no address provided</div>;
diff --git a/src/pages/strategies/activity/index.tsx b/src/pages/strategies/activity/index.tsx
index c370dbd9b..aad4f48e6 100644
--- a/src/pages/strategies/activity/index.tsx
+++ b/src/pages/strategies/activity/index.tsx
@@ -6,7 +6,7 @@ export const StrategiesActivityPage = () => {
   const { user } = useWagmi();
   const params = { ownerId: user };
   return (
-    <ActivityProvider params={params}>
+    <ActivityProvider params={params} url="/strategies/activity">
       <ActivityLayout filters={['ids', 'pairs']} />
     </ActivityProvider>
   );
diff --git a/src/pages/strategies/edit/prices/disposable.tsx b/src/pages/strategies/edit/prices/disposable.tsx
index 63f6910f8..4a98326df 100644
--- a/src/pages/strategies/edit/prices/disposable.tsx
+++ b/src/pages/strategies/edit/prices/disposable.tsx
@@ -30,8 +30,8 @@ export interface EditDisposableStrategySearch {
   editType: 'editPrices' | 'renew';
   min?: string;
   max?: string;
-  settings: StrategySettings;
-  direction: StrategyDirection;
+  settings?: StrategySettings;
+  direction?: StrategyDirection;
   action?: 'deposit' | 'withdraw';
   budget?: string;
 }
diff --git a/src/pages/strategies/edit/prices/recurring.tsx b/src/pages/strategies/edit/prices/recurring.tsx
index 935ba8b96..175bbc9ef 100644
--- a/src/pages/strategies/edit/prices/recurring.tsx
+++ b/src/pages/strategies/edit/prices/recurring.tsx
@@ -30,12 +30,12 @@ export interface EditRecurringStrategySearch {
   editType: 'editPrices' | 'renew';
   buyMin?: string;
   buyMax?: string;
-  buySettings: StrategySettings;
+  buySettings?: StrategySettings;
   buyBudget?: string;
   buyAction?: 'deposit' | 'withdraw';
   sellMin?: string;
   sellMax?: string;
-  sellSettings: StrategySettings;
+  sellSettings?: StrategySettings;
   sellBudget?: string;
   sellAction?: 'deposit' | 'withdraw';
 }
@@ -51,7 +51,7 @@ const getOrders = (
 
   const defaultMin = (
     direction: StrategyDirection,
-    settings: StrategySettings
+    settings: StrategySettings = 'limit'
   ) => {
     const isBuy = direction === 'buy';
     const defaultPrice = isBuy ? order0.startRate : order1.endRate;
@@ -69,7 +69,7 @@ const getOrders = (
   };
   const defaultMax = (
     direction: StrategyDirection,
-    settings: StrategySettings
+    settings: StrategySettings = 'limit'
   ) => {
     const isBuy = direction === 'buy';
     const defaultPrice = isBuy ? order0.startRate : order1.endRate;
@@ -89,7 +89,7 @@ const getOrders = (
     buy: {
       min: search.buyMin ?? defaultMin('buy', search.buySettings) ?? '',
       max: search.buyMax ?? defaultMax('buy', search.buySettings) ?? '',
-      settings: search.buySettings,
+      settings: search.buySettings ?? 'limit',
       action: search.buyAction ?? 'deposit',
       budget: getTotalBudget(
         search.buyAction ?? 'deposit',
@@ -100,7 +100,7 @@ const getOrders = (
     sell: {
       min: search.sellMin ?? defaultMin('sell', search.sellSettings) ?? '',
       max: search.sellMax ?? defaultMax('sell', search.sellSettings) ?? '',
-      settings: search.sellSettings,
+      settings: search.sellSettings ?? 'limit',
       action: search.sellAction ?? 'deposit',
       budget: getTotalBudget(
         search.sellAction ?? 'deposit',
diff --git a/src/pages/strategy/index.tsx b/src/pages/strategy/index.tsx
index c0e1b7abb..d14b352f3 100644
--- a/src/pages/strategy/index.tsx
+++ b/src/pages/strategy/index.tsx
@@ -37,7 +37,7 @@ import config from 'config';
 import { StrategyBlockInfo } from 'components/strategies/overview/strategyBlock/StrategyBlockInfo';
 import { useActivityQuery } from 'components/activity/useActivityQuery';
 import { Radio, RadioGroup } from 'components/common/radio/RadioGroup';
-import { ActivitySearchParams } from 'components/activity/utils';
+import { StrategyPageSearch } from 'libs/routing/routes/strategy';
 
 export const StrategyPage = () => {
   const { history } = useRouter();
@@ -50,7 +50,7 @@ export const StrategyPage = () => {
   const query = useGetStrategy(id);
   const [strategy] = useStrategiesWithFiat(query);
 
-  const setSearch = (search: Partial<ActivitySearchParams>) => {
+  const setSearch = (search: Partial<StrategyPageSearch>) => {
     navigate({
       params: (params) => params,
       search: (previous) => ({ ...previous, ...search }),
@@ -192,7 +192,7 @@ export const StrategyPage = () => {
           />
         </article>
       </section>
-      <ActivityProvider params={params}>
+      <ActivityProvider params={params} url="/strategy/$id">
         <ActivityLayout filters={[]} />
       </ActivityProvider>
     </Page>
diff --git a/src/services/events/explorerEvents.ts b/src/services/events/explorerEvents.ts
index a6c98a4c8..a567ba8c3 100644
--- a/src/services/events/explorerEvents.ts
+++ b/src/services/events/explorerEvents.ts
@@ -10,7 +10,7 @@ import { Strategy } from 'libs/queries';
 import { prepareGtmStrategyData } from './strategyEvents';
 
 interface ExplorerSearchInput {
-  type: ExplorerType;
+  type?: ExplorerType;
   slug?: string;
   strategies: Strategy[];
   filter: string;
diff --git a/yarn.lock b/yarn.lock
index 5ea5c520d..6a7d24592 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3384,6 +3384,11 @@
   resolved "https://registry.yarnpkg.com/@tanstack/history/-/history-1.4.9.tgz#37794f8aa96568a12b7ac40335bae06953577a87"
   integrity sha512-hLdZMwvYNE8d6v8wJvHtbOJfkA7Er6wNm3i4bLAl06y6PjkmU2mmI8slh2GkB+evogJ0OHRoVAr6n6S6bbxDgg==
 
+"@tanstack/history@1.57.6":
+  version "1.57.6"
+  resolved "https://registry.yarnpkg.com/@tanstack/history/-/history-1.57.6.tgz#665d6bb2451ffb07db3596fe74e2f7be03c941b6"
+  integrity sha512-ppAJbnUaHdHmccVmplcd1ivX4GMPHxhStSquuuz0TSAEPEpz0iOVBur4iKfvIuMKm24c40nhvaEwZbKGVfbrGg==
+
 "@tanstack/query-core@5.40.0":
   version "5.40.0"
   resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.40.0.tgz#c74ae8303752ed4b5a0ab848ec71a0e6e8179f83"
@@ -3408,7 +3413,7 @@
   dependencies:
     "@tanstack/query-core" "5.40.0"
 
-"@tanstack/react-router@1.4.9", "@tanstack/react-router@^1.4.9":
+"@tanstack/react-router@1.4.9":
   version "1.4.9"
   resolved "https://registry.yarnpkg.com/@tanstack/react-router/-/react-router-1.4.9.tgz#4146680d9b37cfcd516b75eb87f07761a22e252d"
   integrity sha512-OkjGAGi7Hxr49dHm9jaFsSICBoEXF0tFC1kSSNgiXH2TqSAGIm0yW9+ltQT5PKYW4jTm6vzwqA3xA8vUWdUQiA==
@@ -3420,6 +3425,16 @@
     tiny-invariant "^1.3.1"
     tiny-warning "^1.0.3"
 
+"@tanstack/react-router@1.57.18":
+  version "1.57.18"
+  resolved "https://registry.yarnpkg.com/@tanstack/react-router/-/react-router-1.57.18.tgz#d1c4d2e512500083a7f16d1615d9122e719288ec"
+  integrity sha512-Ek+QYUXyT2njKHNRDRLlMwmvh4geVPyV+1yg5tgFVERabbFz1k9/k6tvIcvdV7R5qDf27zSPBQVj71YNYVRG4A==
+  dependencies:
+    "@tanstack/history" "1.57.6"
+    "@tanstack/react-store" "^0.5.5"
+    tiny-invariant "^1.3.3"
+    tiny-warning "^1.0.3"
+
 "@tanstack/react-store@^0.2.1":
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/@tanstack/react-store/-/react-store-0.2.1.tgz#c1a04c85d403d842e56c6d0709211f013bdd1021"
@@ -3428,6 +3443,14 @@
     "@tanstack/store" "0.1.3"
     use-sync-external-store "^1.2.0"
 
+"@tanstack/react-store@^0.5.5":
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/@tanstack/react-store/-/react-store-0.5.5.tgz#152e7b95de326886f7650f3a56d578369c061bd5"
+  integrity sha512-1orYXGatBqXCYKuroFwV8Ll/6aDa5E3pU6RR4h7RvRk7TmxF1+zLCsWALZaeijXkySNMGmvawSbUXRypivg2XA==
+  dependencies:
+    "@tanstack/store" "0.5.5"
+    use-sync-external-store "^1.2.2"
+
 "@tanstack/react-table@^8.9.3":
   version "8.9.3"
   resolved "https://registry.yarnpkg.com/@tanstack/react-table/-/react-table-8.9.3.tgz#03a52e9e15f65c82a8c697a445c42bfca0c5cfc4"
@@ -3451,11 +3474,21 @@
     "@tanstack/react-router" "1.4.9"
     date-fns "^2.29.1"
 
+"@tanstack/router-valibot-adapter@^1.57.18":
+  version "1.57.18"
+  resolved "https://registry.yarnpkg.com/@tanstack/router-valibot-adapter/-/router-valibot-adapter-1.57.18.tgz#f4d37541e8e4e5471dc0618d91b6547f42d1b6ae"
+  integrity sha512-abQ5vY4W/2h8wWE4AGm0EpO6w2Ti00kEjxuQ8Gq6CZGMwVfav+uUhAdS14xUup17BsCom3c2vIZ5krt7TpukpQ==
+
 "@tanstack/store@0.1.3", "@tanstack/store@^0.1.3":
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/@tanstack/store/-/store-0.1.3.tgz#b8410435dac0a0f6d3fe77d49509f296905d4c73"
   integrity sha512-GnolmC8Fr4mvsHE1fGQmR3Nm0eBO3KnZjDU0a+P3TeQNM/dDscFGxtA7p31NplQNW3KwBw4t1RVFmz0VeKLxcw==
 
+"@tanstack/store@0.5.5":
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/@tanstack/store/-/store-0.5.5.tgz#84d78568c4a71c885cb15754bf51eca42a776efe"
+  integrity sha512-EOSrgdDAJExbvRZEQ/Xhh9iZchXpMN+ga1Bnk8Nmygzs8TfiE6hbzThF+Pr2G19uHL6+DTDTHhJ8VQiOd7l4tA==
+
 "@tanstack/table-core@8.9.3":
   version "8.9.3"
   resolved "https://registry.yarnpkg.com/@tanstack/table-core/-/table-core-8.9.3.tgz#991da6b015f6200fdc841c48048bee5e197f6a46"
@@ -9588,16 +9621,7 @@ string-natural-compare@^3.0.1:
   resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4"
   integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==
 
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -9670,14 +9694,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -9878,6 +9895,11 @@ tiny-invariant@^1.3.1:
   resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.1.tgz#8560808c916ef02ecfd55e66090df23a4b7aa642"
   integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==
 
+tiny-invariant@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127"
+  integrity sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==
+
 tiny-warning@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
@@ -10270,6 +10292,11 @@ use-sync-external-store@1.2.0, use-sync-external-store@^1.2.0:
   resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"
   integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==
 
+use-sync-external-store@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz#c3b6390f3a30eba13200d2302dcdf1e7b57b2ef9"
+  integrity sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==
+
 utf-8-validate@^5.0.2:
   version "5.0.10"
   resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.10.tgz#d7d10ea39318171ca982718b6b96a8d2442571a2"
@@ -10547,7 +10574,7 @@ wordwrapjs@^4.0.0:
     reduce-flatten "^2.0.0"
     typical "^5.2.0"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -10565,15 +10592,6 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"