diff --git a/src/app/(public)/_components/search-form.tsx b/src/app/(public)/_components/search-form.tsx
index cb52e32..71e5d06 100644
--- a/src/app/(public)/_components/search-form.tsx
+++ b/src/app/(public)/_components/search-form.tsx
@@ -1,25 +1,29 @@
 'use client';
 
-import { usePathname, useSearchParams, useRouter } from 'next/navigation';
+import { usePathname } from 'next/navigation';
 import { useForm } from 'react-hook-form';
 import { GoX } from 'react-icons/go';
+import { useQueryState } from 'nuqs';
 
 interface FormValues {
   searchQuery: string;
 }
 
 export function SearchForm() {
-  const router = useRouter();
   const pathname = usePathname();
-  const searchParams = useSearchParams();
+  const [searchQuery, setSearchQuery] = useQueryState('q', {
+    defaultValue: '',
+    parse: (value: string) => value,
+    serialize: (value: string) => value || ''
+  });
 
   const { register, handleSubmit, reset, watch } = useForm<FormValues>({
     defaultValues: {
-      searchQuery: searchParams.get('q') as string
+      searchQuery: searchQuery
     }
   });
 
-  const searchQuery = watch('searchQuery');
+  const queryValue = watch('searchQuery');
 
   if (!pathname.startsWith('/repos')) {
     return null;
@@ -28,12 +32,9 @@ export function SearchForm() {
   function onSubmit({ searchQuery }: FormValues) {
     if (!pathname.startsWith('/repos')) return;
 
-    const reposPathname = pathname as `/repos/${string}`;
     const trimmedQuery = searchQuery.trim();
     if (trimmedQuery !== '') {
-      const sp = new URLSearchParams(searchParams);
-      sp.set('q', trimmedQuery);
-      router.push(`${reposPathname}?${sp.toString()}`);
+      void setSearchQuery(trimmedQuery);
     }
   }
 
@@ -47,11 +48,14 @@ export function SearchForm() {
             type="text"
             {...register('searchQuery', { required: true })}
           />
-          {searchQuery && searchQuery.trim() !== '' && (
+          {queryValue && queryValue.trim() !== '' && (
             <button
               className="absolute top-0 right-0 rounded-l-none btn btn-ghost btn-sm"
               type="button"
-              onClick={() => reset()}
+              onClick={() => {
+                reset();
+                void setSearchQuery(null);
+              }}
             >
               <GoX color="white" />
             </button>
diff --git a/src/app/(public)/repos/_components/pagination.tsx b/src/app/(public)/repos/_components/pagination.tsx
index 5d105a0..07f3faa 100644
--- a/src/app/(public)/repos/_components/pagination.tsx
+++ b/src/app/(public)/repos/_components/pagination.tsx
@@ -2,33 +2,30 @@
 
 import { Button } from '@/app/(public)/_components/button';
 import { ArrowLeft, ArrowRight, Loader2 } from 'lucide-react';
-import { useRouter } from 'next/navigation';
 import { useTransition } from 'react';
-import type { SearchParams } from '@/types';
+import { useQueryState } from 'nuqs';
 
 const MAX_PER_PAGE = 21;
 interface PaginationProps {
   page: number;
   totalCount: number;
-  searchParams: SearchParams;
 }
 
 export function Pagination({
   page,
-  totalCount,
-  searchParams
+  totalCount
 }: PaginationProps) {
-  const router = useRouter();
+  const [, setPageParam] = useQueryState('p', {
+    defaultValue: '1',
+    parse: (value: string) => value,
+    serialize: (value: string) => value
+  });
   const [isPending, startTransition] = useTransition();
 
   function changePage(delta: number) {
-    const params = new URLSearchParams(
-      Object.entries(searchParams).map(([k, v]) => [k, String(v)])
-    );
-    params.set('p', String(page + delta));
-
+    const newPage = page + delta;
     startTransition(() => {
-      router.push(`?${params.toString()}`);
+      void setPageParam(String(newPage));
     });
   }
 
diff --git a/src/app/(public)/repos/_components/sorter.tsx b/src/app/(public)/repos/_components/sorter.tsx
index 545c35c..31f4718 100644
--- a/src/app/(public)/repos/_components/sorter.tsx
+++ b/src/app/(public)/repos/_components/sorter.tsx
@@ -4,8 +4,9 @@ import { Button } from '@/app/(public)/_components/button';
 import { ArrowUpAZ, Code } from 'lucide-react';
 import Link from 'next/link';
 import languages from '@/assets/languages.json';
-import { usePathname, useSearchParams } from 'next/navigation';
+import { usePathname } from 'next/navigation';
 import { sortByName } from '@/lib/utils';
+import { useQueryStates, useQueryState } from 'nuqs';
 
 const { mainLanguages } = languages;
 
@@ -23,88 +24,74 @@ enum SortTypes {
 type Pathname = '/repos' | `/repos/${string}`;
 
 export function Sorter() {
-  const searchParams = useSearchParams();
   const pathname = usePathname() as Pathname;
+  const [sortField] = useQueryState('s', { defaultValue: '' });
+  const [sortOrder] = useQueryState('o', { defaultValue: 'desc' });
+  const [languages_] = useQueryState('l', { parse: (value: string) => value.split(',').filter(Boolean), serialize: (value: string[]) => value.join(',') });
 
   const navigationItems = [
     {
       name: 'Best match',
-      onSelect(sp: URLSearchParams) {
-        sp.delete('o');
-        sp.delete('s');
-        return sp;
+      onSelect(): { s: string | null; o: string | null } {
+        return { s: null, o: null };
       }
     },
     {
       name: 'Most stars',
-      onSelect(sp: URLSearchParams) {
-        sp.set('s', 'stars');
-        sp.set('o', 'desc');
-        return sp;
+      onSelect() {
+        return { s: 'stars', o: 'desc' };
       }
     },
     {
       name: 'Fewest stars',
-      onSelect(sp: URLSearchParams) {
-        sp.set('s', 'stars');
-        sp.set('o', 'asc');
-        return sp;
+      onSelect() {
+        return { s: 'stars', o: 'asc' };
       }
     },
     {
       name: 'Most forks',
-      onSelect(sp: URLSearchParams) {
-        sp.set('s', 'forks');
-        sp.set('o', 'desc');
-        return sp;
+      onSelect() {
+        return { s: 'forks', o: 'desc' };
       }
     },
     {
       name: 'Fewest forks',
-      onSelect(sp: URLSearchParams) {
-        sp.set('s', 'forks');
-        sp.set('o', 'asc');
-        return sp;
+      onSelect() {
+        return { s: 'forks', o: 'asc' };
       }
     },
     {
       name: 'Most help wanted issues',
-      onSelect(sp: URLSearchParams) {
-        sp.set('s', 'help-wanted-issues');
-        sp.set('o', 'desc');
-        return sp;
+      onSelect() {
+        return { s: 'help-wanted-issues', o: 'desc' };
       }
     },
     {
       name: 'Recently updated',
-      onSelect(sp: URLSearchParams) {
-        sp.set('s', 'updated');
-        sp.set('o', 'desc');
-        return sp;
+      onSelect() {
+        return { s: 'updated', o: 'desc' };
       }
     },
     {
       name: 'Least recently updated',
-      onSelect(sp: URLSearchParams) {
-        sp.set('s', 'updated');
-        sp.set('o', 'asc');
-        return sp;
+      onSelect() {
+        return { s: 'updated', o: 'asc' };
       }
     }
   ];
 
   function selectedSort(): SortTypes {
-    if (searchParams.get('o') === 'asc') {
-      if (searchParams.get('s') === 'stars') return SortTypes.FewestStars;
-      if (searchParams.get('s') === 'forks') return SortTypes.FewestForks;
-      if (searchParams.get('s') === 'updated')
+    if (sortOrder === 'asc') {
+      if (sortField === 'stars') return SortTypes.FewestStars;
+      if (sortField === 'forks') return SortTypes.FewestForks;
+      if (sortField === 'updated')
         return SortTypes.LeastRecentlyUpdated;
       return SortTypes.BestMatch;
-    } else if (searchParams.get('o') === 'desc') {
-      if (searchParams.get('s') === 'stars') return SortTypes.MostStars;
-      if (searchParams.get('s') === 'forks') return SortTypes.MostForks;
-      if (searchParams.get('s') === 'updated') return SortTypes.RecentlyUpdated;
-      if (searchParams.get('s') === 'help-wanted-issues')
+    } else if (sortOrder === 'desc') {
+      if (sortField === 'stars') return SortTypes.MostStars;
+      if (sortField === 'forks') return SortTypes.MostForks;
+      if (sortField === 'updated') return SortTypes.RecentlyUpdated;
+      if (sortField === 'help-wanted-issues')
         return SortTypes.MostHelpWantedIssues;
       return SortTypes.BestMatch;
     } else {
@@ -127,12 +114,17 @@ export function Sorter() {
         <div className="z-[9999] h-64 p-2 overflow-y-auto shadow-lg dropdown-content hidden group-hover:block bg-white/95 backdrop-blur-sm rounded-xl w-60 border border-gray-200/50">
           <ul tabIndex={0} className="menu menu-vertical">
             {mainLanguages.sort(sortByName).map(language => {
-              const sp = new URLSearchParams(searchParams);
-              sp.delete('p');
+              const languageParams = `l=${language.toLowerCase()}`;
+              const currentParams = new URLSearchParams();
+              if (sortField) currentParams.set('s', sortField);
+              if (sortOrder) currentParams.set('o', sortOrder);
+              const queryString = currentParams.toString();
+              const fullQuery = queryString ? `${languageParams}&${queryString}` : languageParams;
+              
               return (
                 <li key={language} onClick={handleClick}>
                   <Link
-                    href={`/repos/${language.toLowerCase()}?${sp.toString()}`}
+                    href={`/repos/${language.toLowerCase()}?${fullQuery}`}
                     className="text-gray-700 hover:text-white hover:bg-hacktoberfest-light-blue rounded-lg transition-colors duration-200 px-3 py-2"
                   >
                     {language}
@@ -151,16 +143,19 @@ export function Sorter() {
         <div className="z-[9999] h-64 p-2 overflow-y-auto shadow-lg dropdown-content hidden group-hover:block -ml-16 bg-white/95 backdrop-blur-sm rounded-xl w-60 border border-gray-200/50">
           <ul tabIndex={0} className="menu menu-vertical">
             {navigationItems.map((item, index) => {
-              const sp = item.onSelect(new URLSearchParams(searchParams));
-              sp.delete('p');
-              if (item.name === SortTypes.BestMatch) {
-                sp.delete('o');
-                sp.delete('s');
+              const { s, o } = item.onSelect();
+              const currentParams = new URLSearchParams();
+              if (s) currentParams.set('s', s);
+              if (o) currentParams.set('o', o);
+              if (languages_ && languages_.length > 0) {
+                currentParams.set('l', languages_.join(','));
               }
+              const queryString = currentParams.toString();
+              
               return (
                 <li key={index} onClick={handleClick}>
                   <Link
-                    href={`${pathname}?${sp.toString()}`}
+                    href={`${pathname}?${queryString}`}
                     className="text-gray-700 hover:text-white hover:bg-hacktoberfest-light-blue rounded-lg transition-colors duration-200 px-3 py-2"
                   >
                     {item.name}
diff --git a/src/app/(public)/repos/_components/stars-filter.tsx b/src/app/(public)/repos/_components/stars-filter.tsx
index d2fcc1d..407a58f 100644
--- a/src/app/(public)/repos/_components/stars-filter.tsx
+++ b/src/app/(public)/repos/_components/stars-filter.tsx
@@ -2,12 +2,11 @@
 
 import {
   useParams,
-  usePathname,
-  useRouter,
-  useSearchParams
+  usePathname
 } from 'next/navigation';
 import { useEffect } from 'react';
 import { Controller, useForm } from 'react-hook-form';
+import { useQueryStates } from 'nuqs';
 
 interface FormValues {
   startStars: number | '';
@@ -17,18 +16,18 @@ interface FormValues {
 type Pathname = '/repos' | `/repos/${string}`;
 
 export function StarsFilter() {
-  const router = useRouter();
   const pathname = usePathname() as Pathname;
-  const searchParams = useSearchParams();
   const params = useParams();
+  const [{ startStars, endStars, p }, setStarsParams] = useQueryStates({
+    startStars: { parse: (value: string) => (value ? +value : ''), serialize: (value: number | '') => value === '' ? '' : String(value) },
+    endStars: { parse: (value: string) => (value ? +value : ''), serialize: (value: number | '') => value === '' ? '' : String(value) },
+    p: { parse: (value: string) => (value ? +value : 1), serialize: (value: number) => String(value) }
+  });
+
   const { handleSubmit, control, reset } = useForm<FormValues>({
     defaultValues: {
-      startStars: !searchParams.get('startStars')
-        ? ''
-        : +(searchParams.get('startStars') as string),
-      endStars: !searchParams.get('endStars')
-        ? ''
-        : +(searchParams.get('endStars') as string)
+      startStars: startStars === '' ? '' : startStars || '',
+      endStars: endStars === '' ? '' : endStars || ''
     }
   });
 
@@ -36,21 +35,24 @@ export function StarsFilter() {
   useEffect(() => reset(), [params.language]);
 
   function onSubmit({ startStars, endStars }: FormValues) {
-    const sp = new URLSearchParams(searchParams);
     if (
       typeof endStars === 'number' &&
       typeof startStars === 'number' &&
       endStars < startStars
     ) {
       reset({ startStars, endStars: '' });
-      sp.delete('endStars');
-      sp.set('startStars', startStars.toString());
+      void setStarsParams({
+        startStars,
+        endStars: '',
+        p: 1
+      });
     } else {
-      sp.set('startStars', startStars.toString());
-      sp.set('endStars', endStars.toString());
+      void setStarsParams({
+        startStars: typeof startStars === 'number' ? startStars : '',
+        endStars: typeof endStars === 'number' ? endStars : '',
+        p: 1
+      });
     }
-    sp.delete('p');
-    router.push(`${pathname}?${sp.toString()}`);
   }
 
   return (
diff --git a/src/app/(public)/repos/page.tsx b/src/app/(public)/repos/page.tsx
index 3b03988..7b5466c 100644
--- a/src/app/(public)/repos/page.tsx
+++ b/src/app/(public)/repos/page.tsx
@@ -64,7 +64,6 @@ export default async function ReposPage({
           <Pagination
             page={page}
             totalCount={repos.total_count}
-            searchParams={sp}
           />
         </div>
       </div>