diff --git a/src/components/search/AlbumSearch.astro b/src/components/search/AlbumSearch.astro
index 56f96f8..c01cc1c 100644
--- a/src/components/search/AlbumSearch.astro
+++ b/src/components/search/AlbumSearch.astro
@@ -19,17 +19,17 @@ let { page } = Astro.props
 if (page < 1) page = 1
 
 const queryString = query
-  .toLowerCase()
-  .split('_')
-  .map((w) => `+${w}`)
+  .trim()
+  .split(/[\s_\-:]+/)
   .join(' ')
+
 const findQuery: Prisma.albumsFindManyArgs = {
   select: { title: true, releaseDate: true, id: true },
   where: {
     OR: [{ title: { search: queryString } }, { subTitle: { search: queryString } }]
   },
   orderBy: {
-    _relevance: { fields: ['title', 'subTitle'], sort: 'desc', search: query.toLowerCase() }
+    _relevance: { fields: ['title', 'subTitle'], sort: 'desc', search: queryString }
   }
 }
 const countQuery: Prisma.albumsCountArgs<DefaultArgs> = {
@@ -76,6 +76,6 @@ const end = Math.min(page * take, count)
   }
 </div>
 
-<div class='text-xl flex gap-x-2'>
+<div class='flex gap-x-2'>
   <SearchNav query={query} count={count} take={take} page={page} />
 </div>
diff --git a/src/components/search/SearchNav.astro b/src/components/search/SearchNav.astro
index 439e5c3..7b9fa2a 100644
--- a/src/components/search/SearchNav.astro
+++ b/src/components/search/SearchNav.astro
@@ -14,9 +14,9 @@ const pageCount = Math.ceil(count / take)
   pageCount > 1
     ? Array.from({ length: pageCount }, (_, i) =>
         page === i + 1 ? (
-          <span class='bg-gray rounded px-2 cursor-pointer'>{i + 1}</span>
+          <span class='text-xl bg-gray rounded px-2 cursor-pointer'>{i + 1}</span>
         ) : (
-          <a class='bg-gray/50 rounded px-2' href={`/search?q=${query}&page=${i + 1}`}>
+          <a class='text-xl bg-gray/50 rounded px-2' href={`/search?q=${query}&page=${i + 1}`}>
             {i + 1}
           </a>
         )