diff --git a/src/app/api/search/suggestions/route.ts b/src/app/api/search/suggestions/route.ts
index bd7536d..debc450 100644
--- a/src/app/api/search/suggestions/route.ts
+++ b/src/app/api/search/suggestions/route.ts
@@ -5,6 +5,8 @@ import { NextRequest, NextResponse } from 'next/server';
 import { getAuthInfoFromCookie } from '@/lib/auth';
 import { getAvailableApiSites, getConfig } from '@/lib/config';
 import { searchFromApi } from '@/lib/downstream';
+import { AdminConfig } from '@/lib/admin.types';
+import { yellowWords } from '@/lib/yellow';
 
 export const runtime = 'nodejs';
 
@@ -25,7 +27,7 @@ export async function GET(request: NextRequest) {
     }
 
     // 生成建议
-    const suggestions = await generateSuggestions(query, authInfo.username);
+    const suggestions = await generateSuggestions(config, query, authInfo.username);
 
     // 从配置中获取缓存时间，如果没有配置则使用默认值300秒（5分钟）
     const cacheTime = config.SiteConfig.SiteInterfaceCacheTime || 300;
@@ -47,7 +49,7 @@ export async function GET(request: NextRequest) {
   }
 }
 
-async function generateSuggestions(query: string, username: string): Promise<
+async function generateSuggestions(config: AdminConfig, query: string, username: string): Promise<
   Array<{
     text: string;
     type: 'exact' | 'related' | 'suggestion';
@@ -67,6 +69,7 @@ async function generateSuggestions(query: string, username: string): Promise<
     realKeywords = Array.from(
       new Set(
         results
+          .filter((r: any) => config.SiteConfig.DisableYellowFilter || !yellowWords.some((word: string) => (r.type_name || '').includes(word)))
           .map((r: any) => r.title)
           .filter(Boolean)
           .flatMap((title: string) => title.split(/[ -:：·、-]/))
diff --git a/src/app/search/page.tsx b/src/app/search/page.tsx
index 5ee3141..7b2bbca 100644
--- a/src/app/search/page.tsx
+++ b/src/app/search/page.tsx
@@ -684,12 +684,12 @@ function SearchPageClient() {
               <div className='mb-4'>
                 <h2 className='text-xl font-bold text-gray-800 dark:text-gray-200'>
                   搜索结果
-                  {searchResults.length > 0 && totalSources > 0 && useFluidSearch && (
+                  {totalSources > 0 && useFluidSearch && (
                     <span className='ml-2 text-sm font-normal text-gray-500 dark:text-gray-400'>
                       {completedSources}/{totalSources}
                     </span>
                   )}
-                  {searchResults.length > 0 && isLoading && useFluidSearch && (
+                  {isLoading && useFluidSearch && (
                     <span className='ml-2 inline-block align-middle'>
                       <span className='inline-block h-3 w-3 border-2 border-gray-300 border-t-green-500 rounded-full animate-spin'></span>
                     </span>