diff --git a/README.zh-cn.md b/README.zh-cn.md
index 387007e..cc3f61c 100644
--- a/README.zh-cn.md
+++ b/README.zh-cn.md
@@ -48,7 +48,7 @@
 - [Abner's memos](https://memos.abnerz6.top/)
 - [小众软件的发现](https://talk.appinn.net/)
 - [小报童优惠与排行榜](https://youhui.xiaobaoto.com/)
-- [热干面拌 10 号土豆泥](https://memo.moran.im/)  
+- [热干面拌 10 号土豆泥](https://memo.moran.im/)
 
 ### 平台
 
diff --git a/src/components/item.astro b/src/components/item.astro
index d09f30f..4144045 100644
--- a/src/components/item.astro
+++ b/src/components/item.astro
@@ -39,6 +39,7 @@ const tagStandaloneClass = 'pt-[30px]'
 const tagLinkClass =
   'inline-block rounded-[4px] border border-line px-[10px] py-[2px] text-muted no-underline hover:border-accent hover:text-accent hover:no-underline'
 const commentsClass = 'ml-[3px] border-l-2 border-line pb-6 pl-[15px] pt-[6px] sm:pl-[30px]'
+const getTagHref = (tag: string) => `/search/result?q=${encodeURIComponent(`#${tag}`)}`
 ---
 
 <article class={articleClass} style={{ 'view-transition-name': `post-${post.id}` }}>
@@ -84,8 +85,8 @@ const commentsClass = 'ml-[3px] border-l-2 border-line pb-6 pl-[15px] pt-[6px] s
     hasTags && (
       <footer class:list={[tagBoxClass, tagPaddingClass, !hasContent && tagStandaloneClass]}>
         <span class="tag-icon" aria-hidden="true" />
-        {post.tags.map((tag) => (
-          <a href={`/search/%23${tag}`} title={tag} class={tagLinkClass}>
+        {post.tags.map((tag: string) => (
+          <a href={getTagHref(tag)} title={tag} class={tagLinkClass}>
             {tag}
           </a>
         ))}
diff --git a/src/lib/telegram/index.ts b/src/lib/telegram/index.ts
index ad14220..b8e1f7d 100644
--- a/src/lib/telegram/index.ts
+++ b/src/lib/telegram/index.ts
@@ -484,7 +484,7 @@ async function extractPost($: CheerioAPI, item: AnyNode | null, options: Extract
     const tagLink = $(tagNode)
     const tagText = tagLink.text()
 
-    tagLink.attr('href', `/search/${encodeURIComponent(tagText)}`)
+    tagLink.attr('href', `/search/result?q=${encodeURIComponent(tagText)}`)
 
     const normalizedTag = tagText.replace('#', '')
     if (normalizedTag) {
diff --git a/src/middleware.ts b/src/middleware.ts
index 39eb16b..de38b83 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -1,17 +1,37 @@
 import { defineMiddleware } from 'astro:middleware'
 
+function getEncodedTagSearchQuery(pathname: string): string {
+  if (!pathname.startsWith('/search/%23')) {
+    return ''
+  }
+
+  try {
+    return decodeURIComponent(pathname.slice('/search/'.length))
+  }
+  catch {
+    return ''
+  }
+}
+
 export const onRequest = defineMiddleware(async (context, next) => {
   context.locals.SITE_URL = `${import.meta.env.SITE ?? ''}${import.meta.env.BASE_URL}`
   context.locals.RSS_URL = `${context.locals.SITE_URL}rss.xml`
   context.locals.RSS_PREFIX = ''
 
-  if (context.url.pathname.startsWith('/search') && context.params.q?.startsWith('#')) {
-    const tag = context.params.q.replace('#', '')
-    context.locals.RSS_URL = `${context.locals.SITE_URL}rss.xml?tag=${tag}`
+  const querySearch = context.url.searchParams.get('q') || ''
+  const legacyTagSearch = getEncodedTagSearchQuery(context.url.pathname)
+  const pathSearch = context.params.q || ''
+  const searchQuery = querySearch || legacyTagSearch || pathSearch
+
+  if (context.url.pathname.startsWith('/search') && searchQuery.startsWith('#')) {
+    const tag = searchQuery.replace('#', '')
+    context.locals.RSS_URL = `${context.locals.SITE_URL}rss.xml?tag=${encodeURIComponent(tag)}`
     context.locals.RSS_PREFIX = `${tag} | `
   }
 
-  const response = await next()
+  const response = legacyTagSearch
+    ? await context.rewrite(`/search/result?q=${encodeURIComponent(legacyTagSearch)}`)
+    : await next()
 
   if (!response.bodyUsed) {
     if (response.headers.get('Content-type') === 'text/html') {
diff --git a/src/pages/tags.astro b/src/pages/tags.astro
index eb42526..d628186 100644
--- a/src/pages/tags.astro
+++ b/src/pages/tags.astro
@@ -11,10 +11,14 @@ channel.seo = {
   title: 'Tags',
 }
 
-const items = (getEnv(import.meta.env, Astro, 'TAGS') || '').split(',').map((tag) => ({
-  href: `/search/%23${tag}`,
-  label: tag,
-}))
+const items = (getEnv(import.meta.env, Astro, 'TAGS') || '')
+  .split(',')
+  .map((tag) => tag.trim())
+  .filter(Boolean)
+  .map((tag) => ({
+    href: `/search/result?q=${encodeURIComponent(`#${tag}`)}`,
+    label: tag,
+  }))
 ---
 
 <Layout channel={channel}>