diff --git a/packages/admin/src/hooks/use-pagination.ts b/packages/admin/src/hooks/use-pagination.ts
index e8ea822..490b257 100644
--- a/packages/admin/src/hooks/use-pagination.ts
+++ b/packages/admin/src/hooks/use-pagination.ts
@@ -23,12 +23,12 @@ export function usePagination() {
 
   function setParams(updates: Partial<PaginationSearch>) {
     navigate({
-      search: ((prev: Record<string, unknown>) => ({
+      search: (prev: any) => ({
         ...prev,
         ...updates,
         // Reset to page 1 when search or sort changes
         page: updates.q !== undefined || updates.sort !== undefined ? 1 : (updates.page ?? (prev as PaginationSearch).page),
-      })) as (prev: Record<string, unknown>) => Record<string, unknown>,
+      }),
       replace: true,
     })
   }
diff --git a/packages/admin/src/routes/_authenticated/accounts/$accountId/enrollments.tsx b/packages/admin/src/routes/_authenticated/accounts/$accountId/enrollments.tsx
index cc3bba1..91a2104 100644
--- a/packages/admin/src/routes/_authenticated/accounts/$accountId/enrollments.tsx
+++ b/packages/admin/src/routes/_authenticated/accounts/$accountId/enrollments.tsx
@@ -41,7 +41,7 @@ function AccountEnrollmentsTab() {
       <div className="flex items-center justify-between">
         <p className="text-sm text-muted-foreground">{data?.pagination.total ?? 0} enrollment(s)</p>
         {hasPermission('lessons.edit') && (
-          <Button size="sm" onClick={() => navigate({ to: '/lessons/enrollments/new', search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'asc' as const } })}>
+          <Button size="sm" onClick={() => navigate({ to: '/lessons/enrollments/new', search: { memberId: undefined, accountId: undefined } })}>
             <Plus className="h-4 w-4 mr-1" />Enroll a Member
           </Button>
         )}
@@ -55,7 +55,7 @@ function AccountEnrollmentsTab() {
         total={data?.data?.length ?? 0}
         onPageChange={() => {}}
         onSort={() => {}}
-        onRowClick={(e) => navigate({ to: '/lessons/enrollments/$enrollmentId', params: { enrollmentId: e.id }, search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'asc' as const } })}
+        onRowClick={(e) => navigate({ to: '/lessons/enrollments/$enrollmentId', params: { enrollmentId: e.id }, search: { tab: 'details' } })}
       />
     </div>
   )
diff --git a/packages/admin/src/routes/_authenticated/accounts/$accountId/members.tsx b/packages/admin/src/routes/_authenticated/accounts/$accountId/members.tsx
index 5bf9b6b..2925d07 100644
--- a/packages/admin/src/routes/_authenticated/accounts/$accountId/members.tsx
+++ b/packages/admin/src/routes/_authenticated/accounts/$accountId/members.tsx
@@ -281,7 +281,7 @@ function MembersTab() {
                             <DropdownMenuItem onClick={() => navigate({
                               to: '/members/$memberId',
                               params: { memberId: m.id },
-                              search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'asc' as const },
+                              search: { tab: 'details' },
                             })}>
                               <Pencil className="mr-2 h-4 w-4" />
                               Edit
diff --git a/packages/admin/src/routes/_authenticated/inventory/$productId.tsx b/packages/admin/src/routes/_authenticated/inventory/$productId.tsx
index 526f175..ff456cd 100644
--- a/packages/admin/src/routes/_authenticated/inventory/$productId.tsx
+++ b/packages/admin/src/routes/_authenticated/inventory/$productId.tsx
@@ -192,7 +192,7 @@ function ProductDetailPage() {
     <div className="space-y-6">
       {/* Header */}
       <div className="flex items-center gap-3">
-        <Button variant="ghost" size="sm" onClick={() => navigate({ to: '/inventory', search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'asc' as const } })}>
+        <Button variant="ghost" size="sm" onClick={() => navigate({ to: '/inventory', search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'asc' as const, categoryId: undefined, isActive: undefined, type: undefined, lowStock: undefined } })}>
           <ArrowLeft className="h-4 w-4" />
         </Button>
         <div className="min-w-0">
diff --git a/packages/admin/src/routes/_authenticated/inventory/index.tsx b/packages/admin/src/routes/_authenticated/inventory/index.tsx
index d9cf96c..9ec153f 100644
--- a/packages/admin/src/routes/_authenticated/inventory/index.tsx
+++ b/packages/admin/src/routes/_authenticated/inventory/index.tsx
@@ -71,7 +71,7 @@ function InventoryPage() {
       queryClient.invalidateQueries({ queryKey: productKeys.all })
       toast.success('Product created')
       setCreateOpen(false)
-      navigate({ to: '/inventory/$productId', params: { productId: product.id }, search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'asc' as const } })
+      navigate({ to: '/inventory/$productId', params: { productId: product.id }, search: { tab: 'details' } })
     },
     onError: (err) => toast.error(err.message),
   })
@@ -246,7 +246,7 @@ function InventoryPage() {
         order={params.order}
         onPageChange={setPage}
         onSort={setSort}
-        onRowClick={(p) => navigate({ to: '/inventory/$productId', params: { productId: p.id }, search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'asc' as const } })}
+        onRowClick={(p) => navigate({ to: '/inventory/$productId', params: { productId: p.id }, search: { tab: 'details' } })}
       />
     </div>
   )
diff --git a/packages/admin/src/routes/_authenticated/lessons/enrollments/$enrollmentId.tsx b/packages/admin/src/routes/_authenticated/lessons/enrollments/$enrollmentId.tsx
index e52e2da..7829e2d 100644
--- a/packages/admin/src/routes/_authenticated/lessons/enrollments/$enrollmentId.tsx
+++ b/packages/admin/src/routes/_authenticated/lessons/enrollments/$enrollmentId.tsx
@@ -131,7 +131,7 @@ function EnrollmentDetailPage() {
   return (
     <div className="space-y-6">
       <div className="flex items-center gap-4">
-        <Button variant="ghost" size="sm" onClick={() => navigate({ to: '/lessons/enrollments', search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'asc' as const } })}>
+        <Button variant="ghost" size="sm" onClick={() => navigate({ to: '/lessons/enrollments', search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'desc' as const, status: undefined, instructorId: undefined } })}>
           <ArrowLeft className="h-4 w-4 mr-1" />Back
         </Button>
         <div className="flex-1">
@@ -344,7 +344,7 @@ function SessionsTab({ enrollmentId, onGenerate, generating }: { enrollmentId: s
         total={data?.data?.length ?? 0}
         onPageChange={() => {}}
         onSort={() => {}}
-        onRowClick={(s) => navigate({ to: '/lessons/sessions/$sessionId', params: { sessionId: s.id }, search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'asc' as const } })}
+        onRowClick={(s) => navigate({ to: '/lessons/sessions/$sessionId', params: { sessionId: s.id }, search: {} })}
       />
     </div>
   )
@@ -383,7 +383,7 @@ function LessonPlanTab({ enrollmentId, memberId, canEdit }: { enrollmentId: stri
       queryClient.invalidateQueries({ queryKey: lessonPlanKeys.all })
       toast.success('Plan created from template')
       setTemplatePickerOpen(false)
-      navigate({ to: '/lessons/plans/$planId', params: { planId: plan.id }, search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'asc' as const } })
+      navigate({ to: '/lessons/plans/$planId', params: { planId: plan.id }, search: {} })
     },
     onError: (err) => toast.error(err.message),
   })
@@ -401,7 +401,7 @@ function LessonPlanTab({ enrollmentId, memberId, canEdit }: { enrollmentId: stri
                 {Math.round(activePlan.progress)}% complete
               </p>
             </div>
-            <Button variant="outline" size="sm" onClick={() => navigate({ to: '/lessons/plans/$planId', params: { planId: activePlan.id }, search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'asc' as const } })}>
+            <Button variant="outline" size="sm" onClick={() => navigate({ to: '/lessons/plans/$planId', params: { planId: activePlan.id }, search: {} })}>
               View Plan
             </Button>
           </div>
diff --git a/packages/admin/src/routes/_authenticated/lessons/enrollments/index.tsx b/packages/admin/src/routes/_authenticated/lessons/enrollments/index.tsx
index c14753a..205d680 100644
--- a/packages/admin/src/routes/_authenticated/lessons/enrollments/index.tsx
+++ b/packages/admin/src/routes/_authenticated/lessons/enrollments/index.tsx
@@ -80,7 +80,7 @@ function EnrollmentsListPage() {
       <div className="flex items-center justify-between">
         <h1 className="text-2xl font-bold">Enrollments</h1>
         {hasPermission('lessons.edit') && (
-          <Button onClick={() => navigate({ to: '/lessons/enrollments/new', search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'asc' as const } })}>
+          <Button onClick={() => navigate({ to: '/lessons/enrollments/new', search: { memberId: undefined, accountId: undefined } })}>
             <Plus className="mr-2 h-4 w-4" />New Enrollment
           </Button>
         )}
@@ -125,7 +125,7 @@ function EnrollmentsListPage() {
         order={params.order}
         onPageChange={setPage}
         onSort={setSort}
-        onRowClick={(e) => navigate({ to: '/lessons/enrollments/$enrollmentId', params: { enrollmentId: e.id }, search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'asc' as const } })}
+        onRowClick={(e) => navigate({ to: '/lessons/enrollments/$enrollmentId', params: { enrollmentId: e.id }, search: { tab: 'details' } })}
       />
     </div>
   )
diff --git a/packages/admin/src/routes/_authenticated/lessons/enrollments/new.tsx b/packages/admin/src/routes/_authenticated/lessons/enrollments/new.tsx
index 88b95d2..4ad8b19 100644
--- a/packages/admin/src/routes/_authenticated/lessons/enrollments/new.tsx
+++ b/packages/admin/src/routes/_authenticated/lessons/enrollments/new.tsx
@@ -108,7 +108,7 @@ function NewEnrollmentPage() {
     },
     onSuccess: (enrollment) => {
       toast.success('Enrollment created')
-      navigate({ to: '/lessons/enrollments/$enrollmentId', params: { enrollmentId: enrollment.id }, search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'asc' as const } })
+      navigate({ to: '/lessons/enrollments/$enrollmentId', params: { enrollmentId: enrollment.id }, search: { tab: 'details' } })
     },
     onError: (err) => toast.error(err.message),
   })
@@ -141,7 +141,7 @@ function NewEnrollmentPage() {
   return (
     <div className="space-y-6 max-w-2xl">
       <div className="flex items-center gap-3">
-        <Button variant="ghost" size="sm" onClick={() => navigate({ to: '/lessons/enrollments', search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'asc' as const } })}>
+        <Button variant="ghost" size="sm" onClick={() => navigate({ to: '/lessons/enrollments', search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'desc' as const, status: undefined, instructorId: undefined } })}>
           <ArrowLeft className="h-4 w-4" />
         </Button>
         <h1 className="text-2xl font-bold">New Enrollment</h1>
@@ -282,7 +282,7 @@ function NewEnrollmentPage() {
           <Button type="submit" disabled={mutation.isPending || !selectedMember || !selectedSlotId || !startDate} size="lg">
             {mutation.isPending ? 'Creating...' : 'Create Enrollment'}
           </Button>
-          <Button variant="secondary" type="button" size="lg" onClick={() => navigate({ to: '/lessons/enrollments', search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'asc' as const } })}>
+          <Button variant="secondary" type="button" size="lg" onClick={() => navigate({ to: '/lessons/enrollments', search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'desc' as const, status: undefined, instructorId: undefined } })}>
             Cancel
           </Button>
         </div>
diff --git a/packages/admin/src/routes/_authenticated/lessons/schedule/index.tsx b/packages/admin/src/routes/_authenticated/lessons/schedule/index.tsx
index b36b969..18e0a9b 100644
--- a/packages/admin/src/routes/_authenticated/lessons/schedule/index.tsx
+++ b/packages/admin/src/routes/_authenticated/lessons/schedule/index.tsx
@@ -152,7 +152,7 @@ function InstructorsTab({ canAdmin, search: _search }: { canAdmin: boolean; sear
         order={params.order}
         onPageChange={setPage}
         onSort={setSort}
-        onRowClick={(i) => navigate({ to: '/lessons/schedule/instructors/$instructorId', params: { instructorId: i.id }, search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'asc' as const } })}
+        onRowClick={(i) => navigate({ to: '/lessons/schedule/instructors/$instructorId', params: { instructorId: i.id }, search: { tab: 'overview' } })}
       />
     </div>
   )
diff --git a/packages/admin/src/routes/_authenticated/lessons/sessions/$sessionId.tsx b/packages/admin/src/routes/_authenticated/lessons/sessions/$sessionId.tsx
index 0824dae..094e560 100644
--- a/packages/admin/src/routes/_authenticated/lessons/sessions/$sessionId.tsx
+++ b/packages/admin/src/routes/_authenticated/lessons/sessions/$sessionId.tsx
@@ -126,7 +126,7 @@ function SessionDetailPage() {
   return (
     <div className="space-y-6 max-w-3xl">
       <div className="flex items-center gap-3">
-        <Button variant="ghost" size="sm" onClick={() => navigate({ to: '/lessons/sessions', search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'asc' as const } })}>
+        <Button variant="ghost" size="sm" onClick={() => navigate({ to: '/lessons/sessions', search: { view: 'list' as const, page: 1, limit: 25, q: undefined, sort: undefined, order: 'desc' as const, status: undefined, instructorId: undefined } })}>
           <ArrowLeft className="h-4 w-4" />
         </Button>
         <div className="flex-1">
diff --git a/packages/admin/src/routes/_authenticated/members/$memberId.tsx b/packages/admin/src/routes/_authenticated/members/$memberId.tsx
index b3b4a7f..8feb901 100644
--- a/packages/admin/src/routes/_authenticated/members/$memberId.tsx
+++ b/packages/admin/src/routes/_authenticated/members/$memberId.tsx
@@ -293,7 +293,7 @@ function MemberDetailPage() {
           <div className="flex items-center justify-between">
             <p className="text-sm text-muted-foreground">{enrollmentsData?.pagination.total ?? 0} enrollment(s)</p>
             {hasPermission('lessons.edit') && (
-              <Button size="sm" onClick={() => navigate({ to: '/lessons/enrollments/new', search: { memberId } })}>
+              <Button size="sm" onClick={() => navigate({ to: '/lessons/enrollments/new', search: { memberId, accountId: undefined } })}>
                 <Plus className="h-4 w-4 mr-1" />Enroll
               </Button>
             )}
@@ -307,7 +307,7 @@ function MemberDetailPage() {
             total={enrollmentsData?.data?.length ?? 0}
             onPageChange={() => {}}
             onSort={() => {}}
-            onRowClick={(e) => navigate({ to: '/lessons/enrollments/$enrollmentId', params: { enrollmentId: e.id }, search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'asc' as const } })}
+            onRowClick={(e) => navigate({ to: '/lessons/enrollments/$enrollmentId', params: { enrollmentId: e.id }, search: { tab: 'details' } })}
           />
         </div>
       )}
diff --git a/packages/admin/src/routes/_authenticated/members/index.tsx b/packages/admin/src/routes/_authenticated/members/index.tsx
index 5e69c9c..e99a34f 100644
--- a/packages/admin/src/routes/_authenticated/members/index.tsx
+++ b/packages/admin/src/routes/_authenticated/members/index.tsx
@@ -84,7 +84,7 @@ function MembersListPage() {
             </Button>
           </DropdownMenuTrigger>
           <DropdownMenuContent align="end">
-            <DropdownMenuItem onClick={() => navigate({ to: '/members/$memberId', params: { memberId: row.id }, search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'asc' as const } })}>
+            <DropdownMenuItem onClick={() => navigate({ to: '/members/$memberId', params: { memberId: row.id }, search: { tab: 'details' } })}>
               <Pencil className="mr-2 h-4 w-4" />
               Edit
             </DropdownMenuItem>
@@ -134,7 +134,7 @@ function MembersListPage() {
         order={params.order}
         onPageChange={setPage}
         onSort={setSort}
-        onRowClick={(member) => navigate({ to: '/members/$memberId', params: { memberId: member.id }, search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'asc' as const } })}
+        onRowClick={(member) => navigate({ to: '/members/$memberId', params: { memberId: member.id }, search: { tab: 'details' } })}
       />
     </div>
   )
diff --git a/packages/admin/src/routes/_authenticated/repairs/index.tsx b/packages/admin/src/routes/_authenticated/repairs/index.tsx
index db0ecb1..71150cf 100644
--- a/packages/admin/src/routes/_authenticated/repairs/index.tsx
+++ b/packages/admin/src/routes/_authenticated/repairs/index.tsx
@@ -137,7 +137,7 @@ function RepairsListPage() {
       <div className="flex items-center justify-between">
         <h1 className="text-2xl font-bold">Repairs</h1>
         {hasPermission('repairs.edit') && (
-          <Button onClick={() => navigate({ to: '/repairs/new', search: { page: 1, limit: 25, q: undefined, sort: undefined, order: 'asc' as const } })}>
+          <Button onClick={() => navigate({ to: '/repairs/new', search: { batchId: undefined, batchName: undefined, accountId: undefined, contactName: undefined } })}>
             <Plus className="mr-2 h-4 w-4" />
             New Repair
           </Button>