diff --git a/src/components/pages/Search.svelte b/src/components/pages/Search.svelte
index b7c084f..ce56360 100644
--- a/src/components/pages/Search.svelte
+++ b/src/components/pages/Search.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import { onDestroy, untrack } from "svelte";
   import { gql, thumbUrl } from "../../lib/client";
-  import { GET_SOURCES, FETCH_SOURCE_MANGA } from "../../lib/queries";
+  import { GET_SOURCES, FETCH_SOURCE_MANGA, FETCH_MANGA } from "../../lib/queries";
   import { cache, CACHE_KEYS, getPageSet } from "../../lib/cache";
-  import { dedupeSources, dedupeMangaById, dedupeMangaByTitle, shouldHideNsfw, shouldHideSource } from "../../lib/util";
+  import { dedupeMangaById, dedupeMangaByTitle, shouldHideNsfw, shouldHideSource, normalizeTitle } from "../../lib/util";
   import { store, setSearchPrefill, setPreviewManga } from "../../store/state.svelte";
   import type { Manga, Source } from "../../lib/types";
 
@@ -17,7 +17,20 @@
     error:   string | null;
   }
 
-  const CONCURRENCY = 6;
+  // ── Cached manga entry for tag/source browsing ────────────────────────────
+  interface CachedManga {
+    id:           number;
+    title:        string;
+    thumbnailUrl: string;
+    inLibrary:    boolean;
+    status:       string;
+    genre:        string[];
+    sourceId:     string;
+    genreEnriched: boolean; // true once fetchManga has been called for this entry
+  }
+
+  const CONCURRENCY    = 6;
+  const POPULAR_PAGES  = 3; // pages to pre-fetch per source
 
   const COMMON_GENRES = [
     "Action","Adventure","Comedy","Drama","Fantasy","Romance",
@@ -35,6 +48,7 @@
     { value: "UNKNOWN",   label: "Unknown"   },
   ];
 
+  // ── Concurrency helper ────────────────────────────────────────────────────
   async function runConcurrent<T>(items: T[], fn: (item: T) => Promise<void>, signal: AbortSignal): Promise<void> {
     let i = 0;
     async function worker() {
@@ -47,11 +61,123 @@
     await Promise.all(Array.from({ length: Math.min(CONCURRENCY, items.length) }, worker));
   }
 
-  function matchesAllTags(m: Manga, tags: string[]): boolean {
-    const genres = (m.genre ?? []).map((g: string) => g.toLowerCase());
-    return tags.every((t) => genres.includes(t.toLowerCase()));
+  // ── Source dedup by preferred lang ────────────────────────────────────────
+  // For each unique source name, keep only the preferred-lang variant (or the
+  // first alphabetically if preferred lang isn't available). This collapses
+  // MangaDex (60+ lang variants) and Manga Ball (40+) down to one each.
+  function dedupSourcesByLang(sources: Source[], preferredLang: string): Source[] {
+    const map = new Map<string, Source>();
+    for (const s of sources) {
+      if (s.id === "0") continue; // skip local source
+      const key      = s.name;
+      const existing = map.get(key);
+      if (!existing) {
+        map.set(key, s);
+        continue;
+      }
+      // Prefer the preferred lang; otherwise keep alphabetically first lang
+      const existingIsPreferred = existing.lang === preferredLang;
+      const newIsPreferred      = s.lang === preferredLang;
+      if (newIsPreferred && !existingIsPreferred) {
+        map.set(key, s);
+      } else if (!existingIsPreferred && !newIsPreferred && s.lang < existing.lang) {
+        map.set(key, s);
+      }
+    }
+    return Array.from(map.values());
   }
 
+  // ── In-memory source manga cache ─────────────────────────────────────────
+  // Keyed by manga id. Shared across tag searches for the session.
+  const sourceCache = new Map<number, CachedManga>();
+  let sourceCacheReady   = $state(false);  // true once phase 1 (popular fetch) is done
+  let sourceCacheLoading = $state(false);
+  let sourceCacheEnriching = $state(false); // true while background genre enrichment runs
+  let sourceCacheAbort: AbortController | null = null;
+
+  // Phase 1: fetch 3 pages of POPULAR per deduped source, store in sourceCache
+  async function buildSourceCache(sources: Source[], signal: AbortSignal) {
+    const pages = [1, 2, 3];
+    const tasks: { src: Source; page: number }[] = [];
+    for (const src of sources) {
+      for (const page of pages) tasks.push({ src, page });
+    }
+
+    await runConcurrent(tasks, async ({ src, page }) => {
+      if (signal.aborted) return;
+      try {
+        const d = await gql<{ fetchSourceManga: { mangas: Manga[]; hasNextPage: boolean } }>(
+          FETCH_SOURCE_MANGA,
+          { source: src.id, type: "POPULAR", page },
+          signal,
+        );
+        if (signal.aborted) return;
+        for (const m of d.fetchSourceManga.mangas) {
+          if (!sourceCache.has(m.id)) {
+            sourceCache.set(m.id, {
+              id:           m.id,
+              title:        m.title,
+              thumbnailUrl: m.thumbnailUrl,
+              inLibrary:    m.inLibrary,
+              status:       (m as any).status ?? "UNKNOWN",
+              genre:        (m as any).genre  ?? [],
+              sourceId:     src.id,
+              genreEnriched: ((m as any).genre?.length ?? 0) > 0,
+            });
+          }
+        }
+      } catch (e: any) {
+        if (e?.name === "AbortError") return;
+        // Individual source failures are silently skipped
+      }
+    }, signal);
+  }
+
+  // Phase 2: background genre enrichment — only for entries with empty genre[]
+  async function enrichGenres(signal: AbortSignal) {
+    const unenriched = [...sourceCache.values()].filter((m) => !m.genreEnriched);
+    if (!unenriched.length) return;
+    sourceCacheEnriching = true;
+    await runConcurrent(unenriched, async (entry) => {
+      if (signal.aborted) return;
+      try {
+        const d = await gql<{ fetchManga: { manga: Manga & { genre: string[]; status: string } } }>(
+          FETCH_MANGA,
+          { id: entry.id },
+          signal,
+        );
+        if (signal.aborted) return;
+        const updated = sourceCache.get(entry.id);
+        if (updated) {
+          updated.genre        = d.fetchManga.manga.genre ?? [];
+          updated.status       = d.fetchManga.manga.status ?? updated.status;
+          updated.genreEnriched = true;
+        }
+      } catch (e: any) {
+        if (e?.name === "AbortError") return;
+        // Mark as enriched anyway so we don't retry endlessly
+        const updated = sourceCache.get(entry.id);
+        if (updated) updated.genreEnriched = true;
+      }
+    }, signal);
+    if (!signal.aborted) sourceCacheEnriching = false;
+  }
+
+  // MANGAS_BY_GENRE — local library query
+  const MANGAS_BY_GENRE = `
+    query MangasByGenre($filter: MangaFilterInput, $first: Int, $offset: Int) {
+      mangas(filter: $filter, first: $first, offset: $offset, orderBy: IN_LIBRARY_AT, orderByType: DESC) {
+        nodes {
+          id title thumbnailUrl inLibrary genre status
+          source { id displayName }
+        }
+        pageInfo { hasNextPage }
+        totalCount
+      }
+    }
+  `;
+
+  // Build GraphQL filter for local library query
   function buildTagFilter(
     tags: string[],
     mode: TagMode,
@@ -75,26 +201,41 @@
     return { and: [genrePart, statusPart] };
   }
 
-  const MANGAS_BY_GENRE = `
-    query MangasByGenre($filter: MangaFilterInput, $first: Int, $offset: Int) {
-      mangas(filter: $filter, first: $first, offset: $offset, orderBy: IN_LIBRARY_AT, orderByType: DESC) {
-        nodes {
-          id title thumbnailUrl inLibrary genre status
-          source { id displayName }
+  // Filter the in-memory source cache by active tags + statuses
+  function filterSourceCache(
+    tags: string[],
+    mode: TagMode,
+    statuses: string[],
+  ): CachedManga[] {
+    return [...sourceCache.values()].filter((m) => {
+      if (!shouldHideNsfw(m as any, store.settings)) return false; // keep non-nsfw
+      // Actually: shouldHideNsfw returns true when we SHOULD hide, so:
+      if (shouldHideNsfw(m as any, store.settings)) return false;
+
+      const statusMatch =
+        statuses.length === 0 || statuses.includes(m.status);
+
+      let genreMatch = true;
+      if (tags.length > 0) {
+        const lowerGenres = m.genre.map((g) => g.toLowerCase());
+        if (mode === "AND") {
+          genreMatch = tags.every((t) => lowerGenres.some((g) => g.includes(t.toLowerCase())));
+        } else {
+          genreMatch = tags.some((t) => lowerGenres.some((g) => g.includes(t.toLowerCase())));
         }
-        pageInfo { hasNextPage }
-        totalCount
       }
-    }
-  `;
 
+      return statusMatch && genreMatch;
+    });
+  }
+
+  // ── Global state ──────────────────────────────────────────────────────────
   let tab: SearchTab = $state("keyword");
+  let preferredLang  = store.settings?.preferredExtensionLang ?? "en";
 
-  let preferredLang = store.settings?.preferredExtensionLang ?? "";
-
-  let allSources:  Source[] = $state([]);
-  let loadingSources         = $state(false);
-  let pendingPrefill         = $state("");
+  let allSources:    Source[] = $state([]);
+  let loadingSources           = $state(false);
+  let pendingPrefill           = $state("");
 
   $effect(() => {
     if (store.searchPrefill) {
@@ -107,15 +248,46 @@
     }
   });
 
+  // Load sources then kick off the cache build
   loadingSources = true;
   gql<{ sources: { nodes: Source[] } }>(GET_SOURCES)
-    .then((d) => { allSources = d.sources.nodes.filter((src: Source) => src.id !== "0"); })
+    .then((d) => {
+      allSources = d.sources.nodes.filter((src: Source) => src.id !== "0");
+      // Kick off source cache build immediately after sources load
+      startSourceCacheBuild();
+    })
     .catch(console.error)
     .finally(() => { loadingSources = false; });
 
+  function startSourceCacheBuild() {
+    if (sourceCacheLoading || sourceCacheReady) return;
+    sourceCacheAbort?.abort();
+    const ctrl = new AbortController();
+    sourceCacheAbort = ctrl;
+    sourceCacheLoading = true;
+    sourceCache.clear();
+
+    const dedupedSources = dedupSourcesByLang(allSources, preferredLang)
+      .filter((s) => !shouldHideSource(s, store.settings));
+
+    buildSourceCache(dedupedSources, ctrl.signal)
+      .then(() => {
+        if (ctrl.signal.aborted) return;
+        sourceCacheReady   = true;
+        sourceCacheLoading = false;
+        // Phase 2: enrich genres in background at low priority
+        enrichGenres(ctrl.signal);
+      })
+      .catch((e) => {
+        if (e?.name !== "AbortError") console.error(e);
+        sourceCacheLoading = false;
+      });
+  }
+
   const availableLangs   = $derived(Array.from(new Set<string>(allSources.map((s) => s.lang))).sort());
   const hasMultipleLangs = $derived(availableLangs.length > 1);
 
+  // ── Keyword tab ───────────────────────────────────────────────────────────
   let kw_query        = $state("");
   let kw_submitted    = $state("");
   let kw_results:     SourceResult[] = $state([]);
@@ -192,62 +364,69 @@
   const kw_hasResults   = $derived(kw_results.some((r) => r.mangas.length > 0));
   const kw_allDone      = $derived(kw_results.length > 0 && kw_results.every((r) => !r.loading));
 
-  let tag_activeTags:       string[] = $state([]);
-  let tag_activeStatuses:   string[] = $state([]);
-  let tag_tagMode:          TagMode  = $state("AND");
-  let tag_tagFilter                  = $state("");
+  // ── Tag tab ───────────────────────────────────────────────────────────────
+  let tag_activeTags:     string[] = $state([]);
+  let tag_activeStatuses: string[] = $state([]);
+  let tag_tagMode:        TagMode  = $state("AND");
+  let tag_tagFilter                = $state("");
 
-  let tag_localResults:     Manga[]  = $state([]);
-  let tag_totalCount                 = $state(0);
-  let tag_loadingLocal               = $state(false);
-  let tag_loadingMoreLocal           = $state(false);
-  let tag_localOffset                = $state(0);
-  let tag_localHasNext               = $state(false);
-  let tag_abortLocal:       AbortController | null = null;
+  // Local library results
+  let tag_localResults:   Manga[]  = $state([]);
+  let tag_totalCount               = $state(0);
+  let tag_loadingLocal             = $state(false);
+  let tag_loadingMoreLocal         = $state(false);
+  let tag_localOffset              = $state(0);
+  let tag_localHasNext             = $state(false);
+  let tag_abortLocal: AbortController | null = null;
 
-  let tag_searchSources              = $state(false);
-  let tag_sourceResults:    Manga[]  = $state([]);
-  let tag_loadingSourceSearch        = $state(false);
-  let tag_loadingMoreSource          = $state(false);
-  let tag_srcNextPage: Map<string, number> = $state(new Map());
-  let tag_abortSource: AbortController | null = null;
+  // Source cache results (filtered client-side from sourceCache)
+  let tag_searchSources    = $state(false);
+  let tag_sourceFiltered:  CachedManga[] = $state([]);
 
   const tag_filteredGenres = $derived.by(() => {
     const q = tag_tagFilter.trim().toLowerCase();
     return q ? COMMON_GENRES.filter((g) => g.toLowerCase().includes(q)) : COMMON_GENRES;
   });
 
-  const tag_hasActiveTags = $derived(tag_activeTags.length > 0 || tag_activeStatuses.length > 0);
-  const tag_localIds      = $derived(new Set(tag_localResults.map((m) => m.id)));
-  const tag_mergedResults = $derived(dedupeMangaByTitle(dedupeMangaById(
-    tag_searchSources
-      ? [...tag_localResults, ...tag_sourceResults.filter((m) => !tag_localIds.has(m.id))]
-      : tag_localResults
-  ), store.settings.mangaLinks));
-  const tag_totalVisible  = $derived(tag_mergedResults.length);
-  const tag_sourceHasMore = $derived(tag_searchSources && [...tag_srcNextPage.values()].some((p) => p > 0));
+  const tag_hasActiveFilters = $derived(tag_activeTags.length > 0 || tag_activeStatuses.length > 0);
 
+  // Local library fetch — triggered when tags or statuses change
   $effect(() => {
-    const _activeTags     = tag_activeTags;
-    const _tagMode        = tag_tagMode;
-    const _activeStatuses = tag_activeStatuses;
-    untrack(() => tagFetchLocal(_activeTags, _tagMode, _activeStatuses));
+    const _tags     = tag_activeTags;
+    const _mode     = tag_tagMode;
+    const _statuses = tag_activeStatuses;
+    untrack(() => tagFetchLocal(_tags, _mode, _statuses));
   });
 
+  // Source cache filter — reactive to filters + cache readiness
+  $effect(() => {
+    const _tags     = tag_activeTags;
+    const _mode     = tag_tagMode;
+    const _statuses = tag_activeStatuses;
+    const _ready    = sourceCacheReady;
+    const _search   = tag_searchSources;
+    untrack(() => {
+      if (_search && _ready && (_tags.length > 0 || _statuses.length > 0)) {
+        tag_sourceFiltered = filterSourceCache(_tags, _mode, _statuses);
+      } else {
+        tag_sourceFiltered = [];
+      }
+    });
+  });
+
+  // Auto-enable source search when local results are sparse
   let tag_autoSearchFired = $state(false);
   $effect(() => {
-    if (!tag_loadingLocal && tag_activeTags.length > 0 && !tag_autoSearchFired && !tag_searchSources && !loadingSources) {
+    if (!tag_loadingLocal && tag_hasActiveFilters && !tag_autoSearchFired && !tag_searchSources && sourceCacheReady) {
       if (tag_localResults.length < 20) {
         untrack(() => { tag_autoSearchFired = true; tag_searchSources = true; });
       }
     }
   });
-  $effect(() => { const _ = tag_activeTags; untrack(() => { tag_autoSearchFired = false; }); });
   $effect(() => {
-    if (tag_searchSources && tag_activeTags.length > 0 && !loadingSources) {
-      const tags = tag_activeTags;
-      untrack(() => tagFetchSources(tags));
-    }
+    const _ = tag_activeTags;
+    const __ = tag_activeStatuses;
+    untrack(() => { tag_autoSearchFired = false; });
   });
 
   async function tagFetchLocal(activeTags: string[], tagMode: TagMode, activeStatuses: string[]) {
@@ -267,10 +446,10 @@
     ).then((d) => {
       if (ctrl.signal.aborted) return;
       const nsfwFilter = (m: Manga) => !shouldHideNsfw(m, store.settings);
-      tag_localResults  = d.mangas.nodes.filter(nsfwFilter);
-      tag_totalCount    = d.mangas.totalCount;
-      tag_localHasNext  = d.mangas.pageInfo.hasNextPage;
-      tag_localOffset   = (store.settings.renderLimit ?? 48);
+      tag_localResults = d.mangas.nodes.filter(nsfwFilter);
+      tag_totalCount   = d.mangas.totalCount;
+      tag_localHasNext = d.mangas.pageInfo.hasNextPage;
+      tag_localOffset  = (store.settings.renderLimit ?? 48);
     }).catch((e: any) => {
       if (e?.name !== "AbortError") console.error(e);
     }).finally(() => {
@@ -278,45 +457,6 @@
     });
   }
 
-  async function tagFetchSources(activeTags: string[]) {
-    tag_abortSource?.abort();
-    const ctrl = new AbortController();
-    tag_abortSource = ctrl;
-    tag_srcNextPage       = new Map();
-    tag_loadingSourceSearch = true;
-    const sources    = dedupeSources(allSources, preferredLang);
-    const primaryTag = activeTags[0];
-    for (const src of sources) tag_srcNextPage.set(src.id, -1);
-    runConcurrent(sources, async (src) => {
-      if (ctrl.signal.aborted) return;
-      const ps      = getPageSet(src.id, "SEARCH", activeTags);
-      const pageKey = CACHE_KEYS.sourceMangaPage(src.id, "SEARCH", 1, activeTags);
-      const result = await cache
-        .get<{ mangas: Manga[]; hasNextPage: boolean }>(
-          pageKey,
-          () => gql<{ fetchSourceManga: { mangas: Manga[]; hasNextPage: boolean } }>(
-            FETCH_SOURCE_MANGA, { source: src.id, type: "SEARCH", page: 1, query: primaryTag }, ctrl.signal,
-          ).then((d) => d.fetchSourceManga),
-        )
-        .catch((e: any) => { if (e?.name !== "AbortError") console.error(e); return null; });
-      if (!result || ctrl.signal.aborted) return;
-      ps.add(1);
-      tag_srcNextPage.set(src.id, result.hasNextPage ? 2 : -1);
-      tag_srcNextPage = new Map(tag_srcNextPage);
-      const matching = (activeTags.length > 1
-        ? result.mangas.filter((m) => matchesAllTags(m, activeTags))
-        : result.mangas
-      ).filter((m) => !shouldHideNsfw(m, store.settings))
-       .filter((m) => tag_activeStatuses.length === 0 || tag_activeStatuses.includes(m.status ?? "UNKNOWN"));
-      if (matching.length > 0) {
-        tag_sourceResults = dedupeMangaByTitle(dedupeMangaById([...tag_sourceResults, ...matching]), store.settings.mangaLinks);
-        tag_loadingSourceSearch = false;
-      }
-    }, ctrl.signal).finally(() => {
-      if (!ctrl.signal.aborted) tag_loadingSourceSearch = false;
-    });
-  }
-
   async function tagLoadMoreLocal() {
     if (tag_loadingMoreLocal || !tag_localHasNext) return;
     tag_loadingMoreLocal = true;
@@ -341,57 +481,13 @@
     }
   }
 
-  async function tagLoadMoreSource() {
-    if (tag_loadingMoreSource || !tag_sourceHasMore) return;
-    tag_loadingMoreSource = true;
-    tag_abortSource?.abort();
-    const ctrl = new AbortController();
-    tag_abortSource = ctrl;
-    const sources    = dedupeSources(allSources, preferredLang).filter((src) => (tag_srcNextPage.get(src.id) ?? -1) > 0);
-    const primaryTag = tag_activeTags[0];
-    try {
-      await runConcurrent(sources, async (src) => {
-        const page    = tag_srcNextPage.get(src.id)!;
-        if (ctrl.signal.aborted) return;
-        const ps      = getPageSet(src.id, "SEARCH", tag_activeTags);
-        const pageKey = CACHE_KEYS.sourceMangaPage(src.id, "SEARCH", page, tag_activeTags);
-        const result = await cache
-          .get<{ mangas: Manga[]; hasNextPage: boolean }>(
-            pageKey,
-            () => gql<{ fetchSourceManga: { mangas: Manga[]; hasNextPage: boolean } }>(
-              FETCH_SOURCE_MANGA, { source: src.id, type: "SEARCH", page, query: primaryTag }, ctrl.signal,
-            ).then((d) => d.fetchSourceManga),
-          )
-          .catch((e: any) => { if (e?.name !== "AbortError") tag_srcNextPage.set(src.id, -1); return null; });
-        if (!result || ctrl.signal.aborted) return;
-        ps.add(page);
-        tag_srcNextPage.set(src.id, result.hasNextPage ? page + 1 : -1);
-        tag_srcNextPage = new Map(tag_srcNextPage);
-        const matching = (tag_activeTags.length > 1
-          ? result.mangas.filter((m) => matchesAllTags(m, tag_activeTags))
-          : result.mangas
-        ).filter((m) => !shouldHideNsfw(m, store.settings))
-         .filter((m) => tag_activeStatuses.length === 0 || tag_activeStatuses.includes(m.status ?? "UNKNOWN"));
-        if (matching.length > 0) {
-          tag_sourceResults = dedupeMangaByTitle(dedupeMangaById([...tag_sourceResults, ...matching]), store.settings.mangaLinks);
-        }
-      }, ctrl.signal);
-    } finally {
-      if (!ctrl.signal.aborted) tag_loadingMoreSource = false;
-    }
-  }
-
   function tagToggleTag(tag: string) {
-    tag_srcNextPage   = new Map();
-    tag_sourceResults = [];
-    tag_activeTags    = tag_activeTags.includes(tag)
+    tag_activeTags = tag_activeTags.includes(tag)
       ? tag_activeTags.filter((t) => t !== tag)
       : [...tag_activeTags, tag];
   }
 
   function tagToggleStatus(status: string) {
-    tag_srcNextPage    = new Map();
-    tag_sourceResults  = [];
     tag_activeStatuses = tag_activeStatuses.includes(status)
       ? tag_activeStatuses.filter((s) => s !== status)
       : [...tag_activeStatuses, status];
@@ -399,11 +495,32 @@
 
   function tagToggleSearchSources() {
     tag_searchSources = !tag_searchSources;
-    if (tag_searchSources && tag_activeTags.length > 0 && !loadingSources) {
-      tagFetchSources(tag_activeTags);
-    }
   }
 
+  // Deduplicate merged results: local library wins over source cache on id,
+  // then dedupe by title to avoid cross-source duplicates.
+  const tag_localIds = $derived(new Set(tag_localResults.map((m) => m.id)));
+  const tag_mergedResults = $derived.by(() => {
+    const localMapped = tag_localResults;
+    const sourceMapped: Manga[] = tag_sourceFiltered
+      .filter((m) => !tag_localIds.has(m.id))
+      .map((m) => ({
+        id:           m.id,
+        title:        m.title,
+        thumbnailUrl: m.thumbnailUrl,
+        inLibrary:    m.inLibrary,
+        genre:        m.genre,
+        status:       m.status,
+      } as Manga));
+    return dedupeMangaByTitle(
+      dedupeMangaById([...localMapped, ...sourceMapped]),
+      store.settings.mangaLinks,
+    );
+  });
+
+  const tag_totalVisible = $derived(tag_mergedResults.length);
+
+  // ── Source browse tab ─────────────────────────────────────────────────────
   let src_selectedLang  = $state(preferredLang || "all");
   let src_activeSource: Source | null = $state(null);
   let src_browseResults: Manga[]       = $state([]);
@@ -422,18 +539,24 @@
     }
   });
 
+  // Source tab visible sources — deduped by preferred lang when showing "all"
   const src_visibleSources = $derived.by(() => {
     const hide = (s: Source) => shouldHideSource(s, store.settings);
     if (src_selectedLang !== "all") {
       return allSources.filter((s) => s.lang === src_selectedLang && !hide(s));
     }
+    // Dedup by name, prefer preferredLang
     const map = new Map<string, Source>();
     for (const s of allSources) {
       if (hide(s)) continue;
-      const key = s.name;
+      const key      = s.name;
       const existing = map.get(key);
       if (!existing) { map.set(key, s); continue; }
-      if (s.lang === preferredLang || (!existing || (existing.lang !== preferredLang && s.lang < existing.lang))) {
+      const existingIsPreferred = existing.lang === preferredLang;
+      const newIsPreferred      = s.lang === preferredLang;
+      if (newIsPreferred && !existingIsPreferred) {
+        map.set(key, s);
+      } else if (!existingIsPreferred && !newIsPreferred && s.lang < existing.lang) {
         map.set(key, s);
       }
     }
@@ -452,8 +575,8 @@
       if (ctrl.signal.aborted) return;
       const incoming = d.fetchSourceManga.mangas.filter((m) => !shouldHideNsfw(m, store.settings));
       src_browseResults = page === 1 ? incoming : [...src_browseResults, ...incoming];
-      src_hasNextPage = d.fetchSourceManga.hasNextPage;
-      src_currentPage = page;
+      src_hasNextPage   = d.fetchSourceManga.hasNextPage;
+      src_currentPage   = page;
     } catch (e: any) {
       if (e?.name !== "AbortError") console.error(e);
     } finally {
@@ -480,44 +603,29 @@
   onDestroy(() => {
     kw_abortCtrl?.abort();
     tag_abortLocal?.abort();
-    tag_abortSource?.abort();
     src_abortCtrl?.abort();
+    sourceCacheAbort?.abort();
   });
 </script>
 
 <div class="root">
-  
+
   <div class="header">
     <h1 class="heading">Search</h1>
     <div class="tabs">
-      <button
-        class="tab"
-        class:tabActive={tab === "keyword"}
-        onclick={() => (tab = "keyword")}
-      >
-        
+      <button class="tab" class:tabActive={tab === "keyword"} onclick={() => (tab = "keyword")}>
         <svg width="11" height="11" viewBox="0 0 256 256" fill="currentColor" aria-hidden="true">
           <path d="M229.66,218.34l-50.07-50.07a88,88,0,1,0-11.31,11.31l50.06,50.07a8,8,0,0,0,11.32-11.31ZM40,112a72,72,0,1,1,72,72A72.08,72.08,0,0,1,40,112Z"/>
         </svg>
         Keyword
       </button>
-      <button
-        class="tab"
-        class:tabActive={tab === "tag"}
-        onclick={() => (tab = "tag")}
-      >
-        
+      <button class="tab" class:tabActive={tab === "tag"} onclick={() => (tab = "tag")}>
         <svg width="11" height="11" viewBox="0 0 256 256" fill="currentColor" aria-hidden="true">
           <path d="M224,104H200l8-48a8,8,0,0,0-15.79-2.67L183.79,104H136l8-48a8,8,0,0,0-15.79-2.67L119.79,104H72a8,8,0,0,0,0,16h45.33L105.6,200H56a8,8,0,0,0,0,16H103l-8,48a8,8,0,0,0,15.79,2.67L119.21,216H168l-8,48a8,8,0,0,0,15.79,2.67L184.21,216H232a8,8,0,0,0,0-16H186.67l11.73-80H224a8,8,0,0,0,0-16Zm-69.33,96H101.6L113.33,120h53.07Z"/>
         </svg>
         Tags
       </button>
-      <button
-        class="tab"
-        class:tabActive={tab === "source"}
-        onclick={() => (tab = "source")}
-      >
-        
+      <button class="tab" class:tabActive={tab === "source"} onclick={() => (tab = "source")}>
         <svg width="11" height="11" viewBox="0 0 256 256" fill="currentColor" aria-hidden="true">
           <path d="M224,128a8,8,0,0,1-8,8H40a8,8,0,0,1,0-16H216A8,8,0,0,1,224,128ZM40,72H216a8,8,0,0,0,0-16H40a8,8,0,0,0,0,16ZM216,184H40a8,8,0,0,0,0,16H216a8,8,0,0,0,0-16Z"/>
         </svg>
@@ -526,29 +634,21 @@
     </div>
   </div>
 
-  
-
   {#if tab === "keyword"}
     <div class="keywordBar">
       <div class="searchBar">
         <svg width="14" height="14" viewBox="0 0 256 256" fill="currentColor" class="searchIcon" aria-hidden="true">
           <path d="M229.66,218.34l-50.07-50.07a88,88,0,1,0-11.31,11.31l50.06,50.07a8,8,0,0,0,11.32-11.31ZM40,112a72,72,0,1,1,72,72A72.08,72.08,0,0,1,40,112Z"/>
         </svg>
-        
         <input
           bind:this={kw_inputEl}
           bind:value={kw_query}
-          use:focusOnMount
           class="searchInput"
           placeholder="Search across sources…"
           onkeydown={(e) => e.key === "Enter" && kwDoSearch(kw_query)}
         />
         {#if kw_query}
-          <button
-            class="clearBtn"
-            title="Clear"
-            onclick={() => { kw_query = ""; kw_inputEl?.focus(); }}
-          >×</button>
+          <button class="clearBtn" title="Clear" onclick={() => { kw_query = ""; kw_inputEl?.focus(); }}>×</button>
         {/if}
         {#if hasMultipleLangs}
           <button
@@ -557,17 +657,12 @@
             title="Language & filter options"
             onclick={() => (kw_showAdvanced = !kw_showAdvanced)}
           >
-            
             <svg width="13" height="13" viewBox="0 0 256 256" fill="currentColor" aria-hidden="true">
               <path d="M40,88H73a32,32,0,0,0,62,0h81a8,8,0,0,0,0-16H135a32,32,0,0,0-62,0H40a8,8,0,0,0,0,16Zm64-24A16,16,0,1,1,88,80,16,16,0,0,1,104,64ZM216,168H183a32,32,0,0,0-62,0H40a8,8,0,0,0,0,16h81a32,32,0,0,0,62,0h33a8,8,0,0,0,0-16Zm-64,24a16,16,0,1,1,16-16A16,16,0,0,1,152,192Z"/>
             </svg>
           </button>
         {/if}
-        <button
-          class="searchBtn"
-          onclick={() => kwDoSearch(kw_query)}
-          disabled={!kw_query.trim() || loadingSources}
-        >
+        <button class="searchBtn" onclick={() => kwDoSearch(kw_query)} disabled={!kw_query.trim() || loadingSources}>
           {#if loadingSources}
             <svg width="13" height="13" viewBox="0 0 256 256" fill="currentColor" class="anim-spin" aria-hidden="true">
               <path d="M232,128a104,104,0,0,1-208,0c0-41,23.81-78.36,60.66-95.27a8,8,0,0,1,6.68,14.54C60.15,61.59,40,93.27,40,128a88,88,0,0,0,176,0c0-34.73-20.15-66.41-51.34-80.73a8,8,0,0,1,6.68-14.54C208.19,49.64,232,87,232,128Z"/>
@@ -589,11 +684,7 @@
           </div>
           <div class="langGrid">
             {#each availableLangs as lang (lang)}
-              <button
-                class="langChip"
-                class:langChipActive={kw_selectedLangs.has(lang)}
-                onclick={() => kwToggleLang(lang)}
-              >
+              <button class="langChip" class:langChipActive={kw_selectedLangs.has(lang)} onclick={() => kwToggleLang(lang)}>
                 {lang === preferredLang ? `${lang.toUpperCase()} ★` : lang.toUpperCase()}
               </button>
             {/each}
@@ -641,16 +732,10 @@
         {#each kw_results.filter((r) => r.mangas.length > 0 || r.loading || r.error) as { source, mangas, loading, error } (source.id)}
           <div class="sourceSection">
             <div class="sourceHeader">
-              <img
-                src={thumbUrl(source.iconUrl)}
-                alt={source.displayName}
-                class="sourceIcon"
-                onerror={(e) => { (e.target as HTMLImageElement).style.display = "none"; }}
-              />
+              <img src={thumbUrl(source.iconUrl)} alt={source.displayName} class="sourceIcon"
+                onerror={(e) => { (e.target as HTMLImageElement).style.display = "none"; }} />
               <span class="sourceName">{source.displayName}</span>
-              {#if hasMultipleLangs}
-                <span class="sourceLang">{source.lang.toUpperCase()}</span>
-              {/if}
+              {#if hasMultipleLangs}<span class="sourceLang">{source.lang.toUpperCase()}</span>{/if}
               {#if loading}
                 <svg width="12" height="12" viewBox="0 0 256 256" fill="currentColor" class="anim-spin" style="color:var(--text-faint);margin-left:auto" aria-hidden="true">
                   <path d="M232,128a104,104,0,0,1-208,0c0-41,23.81-78.36,60.66-95.27a8,8,0,0,1,6.68,14.54C60.15,61.59,40,93.27,40,128a88,88,0,0,0,176,0c0-34.73-20.15-66.41-51.34-80.73a8,8,0,0,1,6.68-14.54C208.19,49.64,232,87,232,128Z"/>
@@ -659,17 +744,12 @@
                 <span class="resultCount">{mangas.length} results</span>
               {/if}
             </div>
-
             {#if error}
               <p class="sourceError">{error}</p>
             {:else if loading}
-              
               <div class="sourceRow">
                 {#each Array(4) as _, i (i)}
-                  <div class="skCard">
-                    <div class="skeleton skCover"></div>
-                    <div class="skeleton skTitle"></div>
-                  </div>
+                  <div class="skCard"><div class="skeleton skCover"></div><div class="skeleton skTitle"></div></div>
                 {/each}
               </div>
             {:else if mangas.length > 0}
@@ -677,13 +757,7 @@
                 {#each mangas.slice(0, (store.settings.renderLimit ?? 48)) as m (m.id)}
                   <button class="card" onclick={() => setPreviewManga(m)}>
                     <div class="coverWrap">
-                      <img
-                        src={thumbUrl(m.thumbnailUrl)}
-                        alt={m.title}
-                        class="cover"
-                        loading="lazy"
-                        decoding="async"
-                      />
+                      <img src={thumbUrl(m.thumbnailUrl)} alt={m.title} class="cover" loading="lazy" decoding="async" />
                       {#if m.inLibrary}<span class="inLibBadge">Saved</span>{/if}
                     </div>
                     <p class="cardTitle">{m.title}</p>
@@ -703,21 +777,14 @@
       </div>
     {/if}
 
-  
-
   {:else if tab === "tag"}
     <div class="splitRoot">
-      
       <div class="splitSidebar">
         <div class="splitSearchWrap">
           <svg width="12" height="12" viewBox="0 0 256 256" fill="currentColor" class="splitSearchIcon" aria-hidden="true">
             <path d="M229.66,218.34l-50.07-50.07a88,88,0,1,0-11.31,11.31l50.06,50.07a8,8,0,0,0,11.32-11.31ZM40,112a72,72,0,1,1,72,72A72.08,72.08,0,0,1,40,112Z"/>
           </svg>
-          <input
-            bind:value={tag_tagFilter}
-            class="splitSearchInput"
-            placeholder="Filter genres…"
-          />
+          <input bind:value={tag_tagFilter} class="splitSearchInput" placeholder="Filter genres…" />
           {#if tag_tagFilter}
             <button class="splitSearchClear" title="Clear" onclick={() => (tag_tagFilter = "")}>×</button>
           {/if}
@@ -725,23 +792,14 @@
         <div class="splitList">
           <div class="splitSectionLabel">Status</div>
           {#each MANGA_STATUSES as { value, label } (value)}
-            <button
-              class="splitItem"
-              class:splitItemActive={tag_activeStatuses.includes(value)}
-              onclick={() => tagToggleStatus(value)}
-            >
+            <button class="splitItem" class:splitItemActive={tag_activeStatuses.includes(value)} onclick={() => tagToggleStatus(value)}>
               <span class="splitItemLabel">{label}</span>
               {#if tag_activeStatuses.includes(value)}<span class="tagCheckMark">✓</span>{/if}
             </button>
           {/each}
-
           <div class="splitSectionLabel splitSectionLabelSpaced">Genre</div>
           {#each tag_filteredGenres as tag (tag)}
-            <button
-              class="splitItem"
-              class:splitItemActive={tag_activeTags.includes(tag)}
-              onclick={() => tagToggleTag(tag)}
-            >
+            <button class="splitItem" class:splitItemActive={tag_activeTags.includes(tag)} onclick={() => tagToggleTag(tag)}>
               <span class="splitItemLabel">{tag}</span>
               {#if tag_activeTags.includes(tag)}<span class="tagCheckMark">✓</span>{/if}
             </button>
@@ -752,9 +810,8 @@
         </div>
       </div>
 
-      
       <div class="splitContent">
-        {#if !tag_hasActiveTags}
+        {#if !tag_hasActiveFilters}
           <div class="empty">
             <svg width="32" height="32" viewBox="0 0 256 256" fill="currentColor" class="emptyIcon" aria-hidden="true">
               <path d="M224,104H200l8-48a8,8,0,0,0-15.79-2.67L183.79,104H136l8-48a8,8,0,0,0-15.79-2.67L119.79,104H72a8,8,0,0,0,0,16h45.33L105.6,200H56a8,8,0,0,0,0,16H103l-8,48a8,8,0,0,0,15.79,2.67L119.21,216H168l-8,48a8,8,0,0,0,15.79,2.67L184.21,216H232a8,8,0,0,0,0-16H186.67l11.73-80H224a8,8,0,0,0,0-16Zm-69.33,96H101.6L113.33,120h53.07Z"/>
@@ -763,7 +820,6 @@
             <p class="emptyHint">Select a status or genre to find matching manga.</p>
           </div>
         {:else}
-          
           <div class="tagActiveBar">
             <div class="tagPillRow">
               {#each tag_activeStatuses as status (status)}
@@ -782,42 +838,29 @@
             <div class="tagBarRight">
               {#if tag_activeTags.length > 1}
                 <div class="tagModeToggle">
-                  <button
-                    class="tagModeBtn"
-                    class:tagModeBtnActive={tag_tagMode === "AND"}
-                    title="Match ALL tags"
-                    onclick={() => (tag_tagMode = "AND")}
-                  >AND</button>
-                  <button
-                    class="tagModeBtn"
-                    class:tagModeBtnActive={tag_tagMode === "OR"}
-                    title="Match ANY tag"
-                    onclick={() => (tag_tagMode = "OR")}
-                  >OR</button>
+                  <button class="tagModeBtn" class:tagModeBtnActive={tag_tagMode === "AND"} title="Match ALL tags" onclick={() => (tag_tagMode = "AND")}>AND</button>
+                  <button class="tagModeBtn" class:tagModeBtnActive={tag_tagMode === "OR"}  title="Match ANY tag"  onclick={() => (tag_tagMode = "OR")}>OR</button>
                 </div>
               {/if}
               <button
                 class="tagModeBtn"
                 class:tagModeBtnActive={tag_searchSources}
-                title="Also search across sources (slower, requires network)"
-                disabled={loadingSources}
+                title={sourceCacheLoading ? "Building source cache…" : sourceCacheReady ? "Search across sources" : "Sources unavailable"}
+                disabled={!sourceCacheReady && !sourceCacheLoading}
                 onclick={tagToggleSearchSources}
               >
-                
-                <svg width="11" height="11" viewBox="0 0 256 256" fill="currentColor" style="margin-right:3px;vertical-align:middle" aria-hidden="true">
-                  <path d="M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24ZM101.63,168h52.74C149,186.34,140,202.87,128,215.89,116,202.87,107,186.34,101.63,168ZM98,152a145.72,145.72,0,0,1,0-48h60a145.72,145.72,0,0,1,0,48ZM40,128a87.61,87.61,0,0,1,3.33-24H81.79a161.79,161.79,0,0,0,0,48H43.33A87.61,87.61,0,0,1,40,128ZM154.37,88H101.63C107,69.66,116,53.13,128,40.11,140,53.13,149,69.66,154.37,88ZM174.21,104h38.46a88.15,88.15,0,0,1,0,48H174.21a161.79,161.79,0,0,0,0-48Zm32.32-16H170.71a133.32,133.32,0,0,0-22.7-45.8A88.21,88.21,0,0,1,206.53,88ZM108,42.2A133.32,133.32,0,0,0,85.29,88H49.47A88.21,88.21,0,0,1,108,42.2ZM49.47,168H85.29A133.32,133.32,0,0,0,108,213.8,88.21,88.21,0,0,1,49.47,168Zm98.53,45.8A133.32,133.32,0,0,0,170.71,168h35.82A88.21,88.21,0,0,1,148,213.8Z"/>
-                </svg>
-                Sources
+                {#if sourceCacheLoading}
+                  <svg width="11" height="11" viewBox="0 0 256 256" fill="currentColor" class="anim-spin" aria-hidden="true">
+                    <path d="M232,128a104,104,0,0,1-208,0c0-41,23.81-78.36,60.66-95.27a8,8,0,0,1,6.68,14.54C60.15,61.59,40,93.27,40,128a88,88,0,0,0,176,0c0-34.73-20.15-66.41-51.34-80.73a8,8,0,0,1,6.68-14.54C208.19,49.64,232,87,232,128Z"/>
+                  </svg>
+                {:else}
+                  <svg width="11" height="11" viewBox="0 0 256 256" fill="currentColor" style="margin-right:3px;vertical-align:middle" aria-hidden="true">
+                    <path d="M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24ZM101.63,168h52.74C149,186.34,140,202.87,128,215.89,116,202.87,107,186.34,101.63,168ZM98,152a145.72,145.72,0,0,1,0-48h60a145.72,145.72,0,0,1,0,48ZM40,128a87.61,87.61,0,0,1,3.33-24H81.79a161.79,161.79,0,0,0,0,48H43.33A87.61,87.61,0,0,1,40,128ZM154.37,88H101.63C107,69.66,116,53.13,128,40.11,140,53.13,149,69.66,154.37,88ZM174.21,104h38.46a88.15,88.15,0,0,1,0,48H174.21a161.79,161.79,0,0,0,0-48Zm32.32-16H170.71a133.32,133.32,0,0,0-22.7-45.8A88.21,88.21,0,0,1,206.53,88ZM108,42.2A133.32,133.32,0,0,0,85.29,88H49.47A88.21,88.21,0,0,1,108,42.2ZM49.47,168H85.29A133.32,133.32,0,0,0,108,213.8,88.21,88.21,0,0,1,49.47,168Zm98.53,45.8A133.32,133.32,0,0,0,170.71,168h35.82A88.21,88.21,0,0,1,148,213.8Z"/>
+                  </svg>
+                {/if}
+                Sources{sourceCacheEnriching ? " ·" : ""}
               </button>
-              <button
-                class="tagClearAll"
-                onclick={() => {
-                  tag_activeTags = [];
-                  tag_activeStatuses = [];
-                  tag_srcNextPage = new Map();
-                  tag_sourceResults = [];
-                }}
-              >Clear all</button>
+              <button class="tagClearAll" onclick={() => { tag_activeTags = []; tag_activeStatuses = []; }}>Clear all</button>
             </div>
           </div>
 
@@ -834,25 +877,24 @@
                 <span style="margin-left:6px;font-weight:400;opacity:0.55;font-size:0.9em">+ sources</span>
               {/if}
             </span>
-            {#if tag_loadingLocal || tag_loadingSourceSearch}
+            {#if tag_loadingLocal}
               <svg width="13" height="13" viewBox="0 0 256 256" fill="currentColor" class="anim-spin" style="color:var(--text-faint)" aria-hidden="true">
                 <path d="M232,128a104,104,0,0,1-208,0c0-41,23.81-78.36,60.66-95.27a8,8,0,0,1,6.68,14.54C60.15,61.59,40,93.27,40,128a88,88,0,0,0,176,0c0-34.73-20.15-66.41-51.34-80.73a8,8,0,0,1,6.68-14.54C208.19,49.64,232,87,232,128Z"/>
               </svg>
             {:else}
               <span class="splitResultCount">
-                {tag_totalVisible}{tag_localHasNext || tag_sourceHasMore ? "+" : ""} of {tag_totalCount + tag_sourceResults.length} results
+                {tag_totalVisible}{tag_localHasNext ? "+" : ""} results
+                {#if tag_searchSources && sourceCacheReady}
+                  · {sourceCache.size} cached
+                {/if}
               </span>
             {/if}
           </div>
 
           {#if tag_loadingLocal}
-            
             <div class="tagGrid">
               {#each Array(48) as _, i (i)}
-                <div class="skCard">
-                  <div class="skeleton skCover"></div>
-                  <div class="skeleton skTitle"></div>
-                </div>
+                <div class="skCard"><div class="skeleton skCover"></div><div class="skeleton skTitle"></div></div>
               {/each}
             </div>
           {:else if tag_mergedResults.length > 0}
@@ -867,39 +909,17 @@
                 </button>
               {/each}
 
-              {#if tag_loadingSourceSearch}
-                {#each Array(8) as _, i (i)}
-                  <div class="skCard">
-                    <div class="skeleton skCover"></div>
-                    <div class="skeleton skTitle"></div>
-                  </div>
-                {/each}
-              {/if}
-
-              {#if tag_localHasNext || tag_sourceHasMore}
+              {#if tag_localHasNext}
                 <div class="showMoreCell">
-                  {#if tag_localHasNext}
-                    <button class="showMoreBtn" onclick={tagLoadMoreLocal} disabled={tag_loadingMoreLocal}>
-                      {#if tag_loadingMoreLocal}
-                        <svg width="13" height="13" viewBox="0 0 256 256" fill="currentColor" class="anim-spin" aria-hidden="true">
-                          <path d="M232,128a104,104,0,0,1-208,0c0-41,23.81-78.36,60.66-95.27a8,8,0,0,1,6.68,14.54C60.15,61.59,40,93.27,40,128a88,88,0,0,0,176,0c0-34.73-20.15-66.41-51.34-80.73a8,8,0,0,1,6.68-14.54C208.19,49.64,232,87,232,128Z"/>
-                        </svg> Loading…
-                      {:else}
-                        Show more (library)
-                      {/if}
-                    </button>
-                  {/if}
-                  {#if tag_sourceHasMore}
-                    <button class="showMoreBtn" onclick={tagLoadMoreSource} disabled={tag_loadingMoreSource}>
-                      {#if tag_loadingMoreSource}
-                        <svg width="13" height="13" viewBox="0 0 256 256" fill="currentColor" class="anim-spin" aria-hidden="true">
-                          <path d="M232,128a104,104,0,0,1-208,0c0-41,23.81-78.36,60.66-95.27a8,8,0,0,1,6.68,14.54C60.15,61.59,40,93.27,40,128a88,88,0,0,0,176,0c0-34.73-20.15-66.41-51.34-80.73a8,8,0,0,1,6.68-14.54C208.19,49.64,232,87,232,128Z"/>
-                        </svg> Loading…
-                      {:else}
-                        Show more (sources)
-                      {/if}
-                    </button>
-                  {/if}
+                  <button class="showMoreBtn" onclick={tagLoadMoreLocal} disabled={tag_loadingMoreLocal}>
+                    {#if tag_loadingMoreLocal}
+                      <svg width="13" height="13" viewBox="0 0 256 256" fill="currentColor" class="anim-spin" aria-hidden="true">
+                        <path d="M232,128a104,104,0,0,1-208,0c0-41,23.81-78.36,60.66-95.27a8,8,0,0,1,6.68,14.54C60.15,61.59,40,93.27,40,128a88,88,0,0,0,176,0c0-34.73-20.15-66.41-51.34-80.73a8,8,0,0,1,6.68-14.54C208.19,49.64,232,87,232,128Z"/>
+                      </svg> Loading…
+                    {:else}
+                      Show more (library)
+                    {/if}
+                  </button>
                 </div>
               {/if}
             </div>
@@ -910,7 +930,7 @@
                 {#if tag_searchSources}
                   Try OR mode or broader tags.
                 {:else}
-                  Try OR mode, enable Sources, or check that these manga are in your library.
+                  Try OR mode, enable Sources, or check your library.
                 {/if}
               </p>
             </div>
@@ -919,25 +939,18 @@
       </div>
     </div>
 
-  
-
   {:else if tab === "source"}
     <div class="splitRoot">
-      
       <div class="splitSidebar">
         <div class="srcLangRow">
           <span class="langPocketLabel">Language</span>
-          <select
-            class="langSelect"
-            bind:value={src_selectedLang}
-          >
+          <select class="langSelect" bind:value={src_selectedLang}>
             <option value="all">All</option>
             {#each availableLangs as lang (lang)}
               <option value={lang}>{lang.toUpperCase()}{lang === preferredLang ? " ★" : ""}</option>
             {/each}
           </select>
         </div>
-
         {#if loadingSources}
           <div class="splitLoading">
             <svg width="16" height="16" viewBox="0 0 256 256" fill="currentColor" class="anim-spin" style="color:var(--text-faint)" aria-hidden="true">
@@ -947,11 +960,7 @@
         {:else}
           <div class="splitList">
             {#each src_visibleSources as src (src.id)}
-              <button
-                class="splitItem splitItemSource"
-                class:splitItemActive={src_activeSource?.id === src.id}
-                onclick={() => srcSelectSource(src)}
-              >
+              <button class="splitItem splitItemSource" class:splitItemActive={src_activeSource?.id === src.id} onclick={() => srcSelectSource(src)}>
                 <img src={thumbUrl(src.iconUrl)} alt="" class="splitSourceIcon"
                   onerror={(e) => { (e.target as HTMLImageElement).style.display = "none"; }} />
                 <span class="splitItemLabel">{src.name}</span>
@@ -968,7 +977,6 @@
         {/if}
       </div>
 
-      
       <div class="splitContent">
         {#if !src_activeSource}
           <div class="empty">
@@ -981,12 +989,8 @@
         {:else}
           <div class="splitContentHeader">
             <div class="splitSourceTitle">
-              <img
-                src={thumbUrl(src_activeSource.iconUrl)}
-                alt=""
-                class="splitSourceIcon"
-                onerror={(e) => { (e.target as HTMLImageElement).style.display = "none"; }}
-              />
+              <img src={thumbUrl(src_activeSource.iconUrl)} alt="" class="splitSourceIcon"
+                onerror={(e) => { (e.target as HTMLImageElement).style.display = "none"; }} />
               <span class="splitContentTitle">{src_activeSource.displayName}</span>
               {#if src_loadingBrowse}
                 <svg width="13" height="13" viewBox="0 0 256 256" fill="currentColor" class="anim-spin" style="color:var(--text-faint)" aria-hidden="true">
@@ -997,7 +1001,6 @@
               {/if}
             </div>
           </div>
-
           <div class="sourceBrowseBar">
             <div class="searchBar" style="flex:1">
               <svg width="12" height="12" viewBox="0 0 256 256" fill="currentColor" class="searchIcon" aria-hidden="true">
@@ -1013,23 +1016,13 @@
                 <button class="clearBtn" title="Clear search" onclick={srcClearSearch}>×</button>
               {/if}
             </div>
-            <button
-              class="searchBtn"
-              onclick={srcHandleSearch}
-              disabled={!src_browseQuery.trim() || src_loadingBrowse}
-            >
-              Search
-            </button>
+            <button class="searchBtn" onclick={srcHandleSearch} disabled={!src_browseQuery.trim() || src_loadingBrowse}>Search</button>
           </div>
 
           {#if src_loadingBrowse && src_browseResults.length === 0}
-            
             <div class="tagGrid">
               {#each Array(18) as _, i (i)}
-                <div class="skCard">
-                  <div class="skeleton skCover"></div>
-                  <div class="skeleton skTitle"></div>
-                </div>
+                <div class="skCard"><div class="skeleton skCover"></div><div class="skeleton skTitle"></div></div>
               {/each}
             </div>
           {:else if src_browseResults.length > 0}
@@ -1068,9 +1061,7 @@
             {/if}
           {:else if !src_loadingBrowse}
             <div class="empty">
-              <p class="emptyText">
-                {src_submitted ? `No results for "${src_submitted}"` : "No results"}
-              </p>
+              <p class="emptyText">{src_submitted ? `No results for "${src_submitted}"` : "No results"}</p>
             </div>
           {/if}
         {/if}
@@ -1080,745 +1071,128 @@
 </div>
 
 <style>
-  .root {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    overflow: hidden;
-    animation: fadeIn 0.14s ease both;
-  }
-  .header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: var(--sp-4) var(--sp-6);
-    flex-shrink: 0;
-    border-bottom: 1px solid var(--border-dim);
-  }
-  .heading {
-    font-family: var(--font-ui);
-    font-size: var(--text-xs);
-    font-weight: var(--weight-normal);
-    color: var(--text-faint);
-    letter-spacing: var(--tracking-wider);
-    text-transform: uppercase;
-  }
-  .tabs {
-    display: flex;
-    gap: 2px;
-    background: var(--bg-raised);
-    border: 1px solid var(--border-dim);
-    border-radius: var(--radius-md);
-    padding: 2px;
-  }
-  .tab {
-    display: flex;
-    align-items: center;
-    gap: 5px;
-    font-family: var(--font-ui);
-    font-size: var(--text-2xs);
-    letter-spacing: var(--tracking-wide);
-    text-transform: uppercase;
-    padding: 4px 10px;
-    border-radius: var(--radius-sm);
-    background: none;
-    border: 1px solid transparent;
-    color: var(--text-faint);
-    cursor: pointer;
-    transition: background var(--t-base), color var(--t-base);
-    white-space: nowrap;
-  }
+  .root { display: flex; flex-direction: column; height: 100%; overflow: hidden; animation: fadeIn 0.14s ease both; }
+  .header { display: flex; align-items: center; justify-content: space-between; padding: var(--sp-4) var(--sp-6); flex-shrink: 0; border-bottom: 1px solid var(--border-dim); }
+  .heading { font-family: var(--font-ui); font-size: var(--text-xs); font-weight: var(--weight-normal); color: var(--text-faint); letter-spacing: var(--tracking-wider); text-transform: uppercase; }
+  .tabs { display: flex; gap: 2px; background: var(--bg-raised); border: 1px solid var(--border-dim); border-radius: var(--radius-md); padding: 2px; }
+  .tab { display: flex; align-items: center; gap: 5px; font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); text-transform: uppercase; padding: 4px 10px; border-radius: var(--radius-sm); background: none; border: 1px solid transparent; color: var(--text-faint); cursor: pointer; transition: background var(--t-base), color var(--t-base); white-space: nowrap; }
   .tab:hover { color: var(--text-muted); }
-  .tabActive {
-    background: var(--accent-muted);
-    color: var(--accent-fg);
-    border: 1px solid var(--accent-dim);
-  }
+  .tabActive { background: var(--accent-muted); color: var(--accent-fg); border: 1px solid var(--accent-dim); }
   .tabActive:hover { color: var(--accent-fg); }
-  .keywordBar {
-    padding: var(--sp-3) var(--sp-4);
-    flex-shrink: 0;
-    display: flex;
-    flex-direction: column;
-    gap: var(--sp-2);
-  }
-  .searchBar {
-    display: flex;
-    align-items: center;
-    gap: var(--sp-2);
-    background: var(--bg-raised);
-    border: 1px solid var(--border-dim);
-    border-radius: var(--radius-md);
-    padding: 0 var(--sp-3) 0 var(--sp-2);
-    transition: border-color var(--t-base);
-  }
+  .keywordBar { padding: var(--sp-3) var(--sp-4); flex-shrink: 0; display: flex; flex-direction: column; gap: var(--sp-2); }
+  .searchBar { display: flex; align-items: center; gap: var(--sp-2); background: var(--bg-raised); border: 1px solid var(--border-dim); border-radius: var(--radius-md); padding: 0 var(--sp-3) 0 var(--sp-2); transition: border-color var(--t-base); }
   .searchBar:focus-within { border-color: var(--border-strong); }
   .searchIcon { color: var(--text-faint); flex-shrink: 0; }
-  .searchInput {
-    flex: 1;
-    background: none;
-    border: none;
-    outline: none;
-    color: var(--text-primary);
-    font-size: var(--text-sm);
-    padding: 7px 0;
-  }
+  .searchInput { flex: 1; background: none; border: none; outline: none; color: var(--text-primary); font-size: var(--text-sm); padding: 7px 0; }
   .searchInput::placeholder { color: var(--text-faint); }
-  .clearBtn {
-    color: var(--text-faint);
-    font-size: 14px;
-    line-height: 1;
-    background: none;
-    border: none;
-    cursor: pointer;
-    padding: 2px;
-    transition: color var(--t-base);
-  }
+  .clearBtn { color: var(--text-faint); font-size: 14px; line-height: 1; background: none; border: none; cursor: pointer; padding: 2px; transition: color var(--t-base); }
   .clearBtn:hover { color: var(--text-muted); }
-  .advancedBtn {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 28px;
-    height: 28px;
-    border-radius: var(--radius-sm);
-    background: none;
-    border: none;
-    color: var(--text-faint);
-    flex-shrink: 0;
-    cursor: pointer;
-    transition: color var(--t-base), background var(--t-base);
-  }
+  .advancedBtn { display: flex; align-items: center; justify-content: center; width: 28px; height: 28px; border-radius: var(--radius-sm); background: none; border: none; color: var(--text-faint); flex-shrink: 0; cursor: pointer; transition: color var(--t-base), background var(--t-base); }
   .advancedBtn:hover { color: var(--text-muted); background: var(--bg-overlay); }
   .advancedBtnActive { color: var(--accent-fg); background: var(--accent-muted); }
   .advancedBtnActive:hover { color: var(--accent-fg); background: var(--accent-muted); }
-  .searchBtn {
-    font-family: var(--font-ui);
-    font-size: var(--text-xs);
-    letter-spacing: var(--tracking-wide);
-    padding: 6px 12px;
-    border-radius: var(--radius-md);
-    background: var(--accent-muted);
-    color: var(--accent-fg);
-    border: 1px solid var(--accent-dim);
-    cursor: pointer;
-    flex-shrink: 0;
-    display: flex;
-    align-items: center;
-    gap: var(--sp-1);
-    transition: filter var(--t-base);
-  }
+  .searchBtn { font-family: var(--font-ui); font-size: var(--text-xs); letter-spacing: var(--tracking-wide); padding: 6px 12px; border-radius: var(--radius-md); background: var(--accent-muted); color: var(--accent-fg); border: 1px solid var(--accent-dim); cursor: pointer; flex-shrink: 0; display: flex; align-items: center; gap: var(--sp-1); transition: filter var(--t-base); }
   .searchBtn:hover:not(:disabled) { filter: brightness(1.1); }
   .searchBtn:disabled { opacity: 0.4; cursor: default; }
-  .advancedPanel {
-    background: var(--bg-raised);
-    border: 1px solid var(--border-dim);
-    border-radius: var(--radius-md);
-    padding: var(--sp-3);
-    display: flex;
-    flex-direction: column;
-    gap: var(--sp-2);
-    animation: fadeIn 0.1s ease both;
-  }
-  .advancedHeader {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-  .advancedTitle {
-    font-family: var(--font-ui);
-    font-size: var(--text-2xs);
-    color: var(--text-faint);
-    letter-spacing: var(--tracking-wider);
-    text-transform: uppercase;
-  }
+  .advancedPanel { background: var(--bg-raised); border: 1px solid var(--border-dim); border-radius: var(--radius-md); padding: var(--sp-3); display: flex; flex-direction: column; gap: var(--sp-2); animation: fadeIn 0.1s ease both; }
+  .advancedHeader { display: flex; align-items: center; justify-content: space-between; }
+  .advancedTitle { font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-faint); letter-spacing: var(--tracking-wider); text-transform: uppercase; }
   .advancedActions { display: flex; gap: var(--sp-1); }
-  .advancedLink {
-    font-family: var(--font-ui);
-    font-size: var(--text-2xs);
-    letter-spacing: var(--tracking-wide);
-    color: var(--accent-fg);
-    background: none;
-    border: none;
-    padding: 0;
-    cursor: pointer;
-    opacity: 0.7;
-    transition: opacity var(--t-base);
-  }
+  .advancedLink { font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); color: var(--accent-fg); background: none; border: none; padding: 0; cursor: pointer; opacity: 0.7; transition: opacity var(--t-base); }
   .advancedLink:hover { opacity: 1; }
-  .langGrid {
-    display: flex;
-    flex-wrap: wrap;
-    gap: var(--sp-1);
-  }
-  .langChip {
-    font-family: var(--font-ui);
-    font-size: var(--text-2xs);
-    letter-spacing: var(--tracking-wide);
-    padding: 3px 8px;
-    border-radius: var(--radius-sm);
-    border: 1px solid var(--border-dim);
-    background: none;
-    color: var(--text-faint);
-    cursor: pointer;
-    transition: color var(--t-base), border-color var(--t-base), background var(--t-base);
-  }
+  .langGrid { display: flex; flex-wrap: wrap; gap: var(--sp-1); }
+  .langChip { font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); padding: 3px 8px; border-radius: var(--radius-sm); border: 1px solid var(--border-dim); background: none; color: var(--text-faint); cursor: pointer; transition: color var(--t-base), border-color var(--t-base), background var(--t-base); }
   .langChip:hover { color: var(--text-muted); border-color: var(--border-strong); }
-  .langChipActive {
-    background: var(--accent-muted);
-    border-color: var(--accent-dim);
-    color: var(--accent-fg);
-  }
+  .langChipActive { background: var(--accent-muted); border-color: var(--accent-dim); color: var(--accent-fg); }
   .langChipActive:hover { background: var(--accent-muted); color: var(--accent-fg); }
-  .advancedDivider {
-    height: 1px;
-    background: var(--border-dim);
-    margin: 2px 0;
-  }
-  .advancedCheck {
-    display: flex;
-    align-items: center;
-    gap: var(--sp-2);
-    font-family: var(--font-ui);
-    font-size: var(--text-xs);
-    color: var(--text-muted);
-    cursor: pointer;
-  }
-  .checkbox { accent-color: var(--accent-fg); cursor: pointer; }
-  .advancedFooter {
-    font-family: var(--font-ui);
-    font-size: var(--text-2xs);
-    color: var(--text-faint);
-    letter-spacing: var(--tracking-wide);
-  }
-  .advancedLinkStandalone {
-    display: inline-flex;
-    align-items: center;
-    gap: 5px;
-    font-family: var(--font-ui);
-    font-size: var(--text-2xs);
-    letter-spacing: var(--tracking-wide);
-    color: var(--accent-fg);
-    background: none;
-    border: none;
-    padding: 0;
-    cursor: pointer;
-    opacity: 0.7;
-    transition: opacity var(--t-base);
-  }
+  .advancedDivider { height: 1px; background: var(--border-dim); margin: 2px 0; }
+  .advancedFooter { font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-faint); letter-spacing: var(--tracking-wide); }
+  .advancedLinkStandalone { display: inline-flex; align-items: center; gap: 5px; font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); color: var(--accent-fg); background: none; border: none; padding: 0; cursor: pointer; opacity: 0.7; transition: opacity var(--t-base); }
   .advancedLinkStandalone:hover { opacity: 1; }
-  .empty {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    gap: var(--sp-2);
-  }
+  .empty { flex: 1; display: flex; flex-direction: column; align-items: center; justify-content: center; gap: var(--sp-2); }
   .emptyIcon { color: var(--text-faint); }
   .emptyText { font-size: var(--text-base); color: var(--text-muted); }
   .emptyHint { font-size: var(--text-sm); color: var(--text-faint); }
-  .results {
-    flex: 1;
-    overflow-y: auto;
-    display: flex;
-    flex-direction: column;
-  }
-  .sourceSection {
-    padding: var(--sp-1) var(--sp-4) var(--sp-3);
-    border-bottom: 1px solid var(--border-dim);
-  }
+  .results { flex: 1; overflow-y: auto; display: flex; flex-direction: column; }
+  .sourceSection { padding: var(--sp-1) var(--sp-4) var(--sp-3); border-bottom: 1px solid var(--border-dim); }
   .sourceSection:last-child { border-bottom: none; }
-  .sourceHeader {
-    display: flex;
-    align-items: center;
-    gap: var(--sp-2);
-    padding: var(--sp-2) 0;
-  }
-  .sourceIcon {
-    width: 18px;
-    height: 18px;
-    border-radius: var(--radius-sm);
-    object-fit: cover;
-    flex-shrink: 0;
-    background: var(--bg-raised);
-  }
-  .sourceName {
-    font-size: var(--text-base);
-    font-weight: var(--weight-medium);
-    color: var(--text-secondary);
-  }
-  .sourceLang {
-    font-family: var(--font-ui);
-    font-size: var(--text-2xs);
-    color: var(--text-faint);
-    letter-spacing: var(--tracking-wide);
-    background: var(--bg-raised);
-    border: 1px solid var(--border-dim);
-    border-radius: var(--radius-sm);
-    padding: 1px 5px;
-  }
-  .resultCount {
-    margin-left: auto;
-    font-family: var(--font-ui);
-    font-size: var(--text-2xs);
-    color: var(--text-faint);
-    letter-spacing: var(--tracking-wide);
-  }
-  .sourceError {
-    font-size: var(--text-xs);
-    color: var(--color-error);
-    padding: var(--sp-1) 0;
-    margin: 0;
-  }
-  .sourceRow {
-    display: flex;
-    gap: var(--sp-3);
-    overflow-x: auto;
-    padding-bottom: var(--sp-1);
-    scrollbar-width: none;
-  }
+  .sourceHeader { display: flex; align-items: center; gap: var(--sp-2); padding: var(--sp-2) 0; }
+  .sourceIcon { width: 18px; height: 18px; border-radius: var(--radius-sm); object-fit: cover; flex-shrink: 0; background: var(--bg-raised); }
+  .sourceName { font-size: var(--text-base); font-weight: var(--weight-medium); color: var(--text-secondary); }
+  .sourceLang { font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-faint); letter-spacing: var(--tracking-wide); background: var(--bg-raised); border: 1px solid var(--border-dim); border-radius: var(--radius-sm); padding: 1px 5px; }
+  .resultCount { margin-left: auto; font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-faint); letter-spacing: var(--tracking-wide); }
+  .sourceError { font-size: var(--text-xs); color: var(--color-error); padding: var(--sp-1) 0; margin: 0; }
+  .sourceRow { display: flex; gap: var(--sp-3); overflow-x: auto; padding-bottom: var(--sp-1); scrollbar-width: none; }
   .sourceRow::-webkit-scrollbar { display: none; }
-  .card {
-    display: flex;
-    flex-direction: column;
-    gap: var(--sp-2);
-    cursor: pointer;
-    flex-shrink: 0;
-    width: 110px;
-    text-align: left;
-    background: none;
-    border: none;
-    padding: 0;
-  }
+  .card { display: flex; flex-direction: column; gap: var(--sp-2); cursor: pointer; flex-shrink: 0; width: 110px; text-align: left; background: none; border: none; padding: 0; }
   .card:hover .cover { filter: brightness(1.06); }
   .card:hover .cardTitle { color: var(--text-primary); }
-  .coverWrap {
-    position: relative;
-    width: 100%;
-    aspect-ratio: 2 / 3;
-    border-radius: var(--radius-md);
-    overflow: hidden;
-    background: var(--bg-raised);
-    border: 1px solid var(--border-dim);
-    transform: translateZ(0);
-  }
-  .cover {
-    width: 100%;
-    height: 100%;
-    object-fit: cover;
-    transition: filter var(--t-base);
-  }
-  .inLibBadge {
-    position: absolute;
-    bottom: var(--sp-1);
-    right: var(--sp-1);
-    background: var(--accent-dim);
-    color: var(--accent-fg);
-    font-family: var(--font-ui);
-    font-size: 9px;
-    font-weight: var(--weight-medium);
-    letter-spacing: var(--tracking-wide);
-    padding: 1px 5px;
-    border-radius: var(--radius-sm);
-    border: 1px solid var(--accent-muted);
-  }
-  .cardTitle {
-    font-size: var(--text-sm);
-    color: var(--text-secondary);
-    line-height: var(--leading-snug);
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
-    overflow: hidden;
-    transition: color var(--t-base);
-  }
-  .skCard {
-    display: flex;
-    flex-direction: column;
-    gap: var(--sp-2);
-    flex-shrink: 0;
-    width: 110px;
-  }
+  .coverWrap { position: relative; width: 100%; aspect-ratio: 2 / 3; border-radius: var(--radius-md); overflow: hidden; background: var(--bg-raised); border: 1px solid var(--border-dim); transform: translateZ(0); }
+  .cover { width: 100%; height: 100%; object-fit: cover; transition: filter var(--t-base); }
+  .inLibBadge { position: absolute; bottom: var(--sp-1); right: var(--sp-1); background: var(--accent-dim); color: var(--accent-fg); font-family: var(--font-ui); font-size: 9px; font-weight: var(--weight-medium); letter-spacing: var(--tracking-wide); padding: 1px 5px; border-radius: var(--radius-sm); border: 1px solid var(--accent-muted); }
+  .cardTitle { font-size: var(--text-sm); color: var(--text-secondary); line-height: var(--leading-snug); display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; transition: color var(--t-base); }
+  .skCard { display: flex; flex-direction: column; gap: var(--sp-2); flex-shrink: 0; width: 110px; }
   .tagGrid .card  { width: 100%; }
   .tagGrid .skCard { width: 100%; }
   .skeleton { border-radius: var(--radius-sm); }
-  .skCover {
-    aspect-ratio: 2 / 3;
-    width: 100%;
-    border-radius: var(--radius-md);
-  }
+  .skCover { aspect-ratio: 2 / 3; width: 100%; border-radius: var(--radius-md); }
   .skTitle { height: 10px; width: 80%; }
-  .splitRoot {
-    flex: 1;
-    display: flex;
-    overflow: hidden;
-  }
-  .splitSidebar {
-    width: 180px;
-    flex-shrink: 0;
-    border-right: 1px solid var(--border-dim);
-    overflow: hidden;
-    display: flex;
-    flex-direction: column;
-  }
-  .splitSearchWrap {
-    display: flex;
-    align-items: center;
-    gap: var(--sp-1);
-    padding: var(--sp-2) var(--sp-3);
-    border-bottom: 1px solid var(--border-dim);
-    flex-shrink: 0;
-  }
+  .splitRoot { flex: 1; display: flex; overflow: hidden; }
+  .splitSidebar { width: 180px; flex-shrink: 0; border-right: 1px solid var(--border-dim); overflow: hidden; display: flex; flex-direction: column; }
+  .splitSearchWrap { display: flex; align-items: center; gap: var(--sp-1); padding: var(--sp-2) var(--sp-3); border-bottom: 1px solid var(--border-dim); flex-shrink: 0; }
   .splitSearchIcon { color: var(--text-faint); flex-shrink: 0; }
-  .splitSearchInput {
-    flex: 1;
-    background: none;
-    border: none;
-    outline: none;
-    font-size: var(--text-xs);
-    color: var(--text-primary);
-    font-family: var(--font-ui);
-    min-width: 0;
-  }
+  .splitSearchInput { flex: 1; background: none; border: none; outline: none; font-size: var(--text-xs); color: var(--text-primary); font-family: var(--font-ui); min-width: 0; }
   .splitSearchInput::placeholder { color: var(--text-faint); }
-  .splitSearchClear {
-    color: var(--text-faint);
-    font-size: 13px;
-    line-height: 1;
-    background: none;
-    border: none;
-    cursor: pointer;
-    padding: 2px;
-    transition: color var(--t-base);
-  }
+  .splitSearchClear { color: var(--text-faint); font-size: 13px; line-height: 1; background: none; border: none; cursor: pointer; padding: 2px; transition: color var(--t-base); }
   .splitSearchClear:hover { color: var(--text-muted); }
-  .splitList {
-    flex: 1;
-    overflow-y: auto;
-    padding: var(--sp-1);
-    scrollbar-width: thin;
-    scrollbar-color: var(--border-dim) transparent;
-  }
-  .splitSectionLabel {
-    font-family: var(--font-ui);
-    font-size: var(--text-2xs);
-    letter-spacing: var(--tracking-wider);
-    text-transform: uppercase;
-    color: var(--text-faint);
-    padding: var(--sp-2) var(--sp-3) var(--sp-1);
-    pointer-events: none;
-    user-select: none;
-  }
-  .splitSectionLabelSpaced {
-    margin-top: var(--sp-2);
-    border-top: 1px solid var(--border-dim);
-    padding-top: var(--sp-3);
-  }
-  .splitItem {
-    display: flex;
-    align-items: center;
-    gap: var(--sp-2);
-    width: 100%;
-    padding: 7px var(--sp-3);
-    border-radius: var(--radius-md);
-    border: 1px solid transparent;
-    background: none;
-    text-align: left;
-    cursor: pointer;
-    transition: background var(--t-fast), border-color var(--t-fast);
-  }
+  .splitList { flex: 1; overflow-y: auto; padding: var(--sp-1); scrollbar-width: thin; scrollbar-color: var(--border-dim) transparent; }
+  .splitSectionLabel { font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wider); text-transform: uppercase; color: var(--text-faint); padding: var(--sp-2) var(--sp-3) var(--sp-1); pointer-events: none; user-select: none; }
+  .splitSectionLabelSpaced { margin-top: var(--sp-2); border-top: 1px solid var(--border-dim); padding-top: var(--sp-3); }
+  .splitItem { display: flex; align-items: center; gap: var(--sp-2); width: 100%; padding: 7px var(--sp-3); border-radius: var(--radius-md); border: 1px solid transparent; background: none; text-align: left; cursor: pointer; transition: background var(--t-fast), border-color var(--t-fast); }
   .splitItem:hover { background: var(--bg-raised); border-color: var(--border-dim); }
-  .splitItemActive {
-    background: var(--accent-muted);
-    border-color: var(--accent-dim);
-  }
+  .splitItemActive { background: var(--accent-muted); border-color: var(--accent-dim); }
   .splitItemActive:hover { background: var(--accent-muted); }
-  .splitItemLabel {
-    font-size: var(--text-xs);
-    color: var(--text-muted);
-    flex: 1;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
+  .splitItemLabel { font-size: var(--text-xs); color: var(--text-muted); flex: 1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
   .splitItemActive .splitItemLabel { color: var(--accent-fg); font-weight: var(--weight-medium); }
   .splitItemSource { gap: var(--sp-2); }
-  .splitEmpty {
-    font-family: var(--font-ui);
-    font-size: var(--text-xs);
-    color: var(--text-faint);
-    padding: var(--sp-3);
-    margin: 0;
-  }
-  .splitLoading {
-    flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: var(--sp-6);
-  }
-  .splitContent {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-  }
-  .splitContentHeader {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: var(--sp-3) var(--sp-4);
-    border-bottom: 1px solid var(--border-dim);
-    flex-shrink: 0;
-    gap: var(--sp-2);
-  }
-  .splitSourceTitle {
-    display: flex;
-    align-items: center;
-    gap: var(--sp-2);
-    flex: 1;
-    min-width: 0;
-  }
-  .splitContentTitle {
-    font-size: var(--text-base);
-    font-weight: var(--weight-medium);
-    color: var(--text-secondary);
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    letter-spacing: var(--tracking-tight);
-  }
-  .splitResultCount {
-    font-family: var(--font-ui);
-    font-size: var(--text-2xs);
-    color: var(--text-faint);
-    letter-spacing: var(--tracking-wide);
-    flex-shrink: 0;
-  }
-  .splitSourceIcon {
-    width: 18px;
-    height: 18px;
-    border-radius: var(--radius-sm);
-    object-fit: cover;
-    flex-shrink: 0;
-    background: var(--bg-raised);
-  }
-  .tagActiveBar {
-    display: flex;
-    align-items: flex-start;
-    gap: var(--sp-2);
-    padding: var(--sp-2) var(--sp-4);
-    border-bottom: 1px solid var(--border-dim);
-    flex-shrink: 0;
-    flex-wrap: wrap;
-  }
-  .tagPillRow {
-    display: flex;
-    flex-wrap: wrap;
-    gap: var(--sp-1);
-    flex: 1;
-    min-width: 0;
-  }
-  .tagPill {
-    display: inline-flex;
-    align-items: center;
-    gap: 4px;
-    padding: 2px 7px;
-    background: var(--accent-muted);
-    border: 1px solid var(--accent-dim);
-    border-radius: var(--radius-sm);
-    font-family: var(--font-ui);
-    font-size: var(--text-2xs);
-    letter-spacing: var(--tracking-wide);
-    color: var(--accent-fg);
-  }
-  .tagPillStatus {
-    background: color-mix(in srgb, var(--color-info, #4a90d9) 12%, transparent);
-    border-color: color-mix(in srgb, var(--color-info, #4a90d9) 30%, transparent);
-    color: var(--color-info, #4a90d9);
-  }
-  .tagPillRemove {
-    color: currentColor;
-    opacity: 0.6;
-    font-size: 13px;
-    line-height: 1;
-    background: none;
-    border: none;
-    cursor: pointer;
-    padding: 0;
-    transition: opacity var(--t-base);
-  }
+  .splitEmpty { font-family: var(--font-ui); font-size: var(--text-xs); color: var(--text-faint); padding: var(--sp-3); margin: 0; }
+  .splitLoading { flex: 1; display: flex; align-items: center; justify-content: center; padding: var(--sp-6); }
+  .splitContent { flex: 1; display: flex; flex-direction: column; overflow: hidden; }
+  .splitContentHeader { display: flex; align-items: center; justify-content: space-between; padding: var(--sp-3) var(--sp-4); border-bottom: 1px solid var(--border-dim); flex-shrink: 0; gap: var(--sp-2); }
+  .splitSourceTitle { display: flex; align-items: center; gap: var(--sp-2); flex: 1; min-width: 0; }
+  .splitContentTitle { font-size: var(--text-base); font-weight: var(--weight-medium); color: var(--text-secondary); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; letter-spacing: var(--tracking-tight); }
+  .splitResultCount { font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-faint); letter-spacing: var(--tracking-wide); flex-shrink: 0; }
+  .splitSourceIcon { width: 18px; height: 18px; border-radius: var(--radius-sm); object-fit: cover; flex-shrink: 0; background: var(--bg-raised); }
+  .tagActiveBar { display: flex; align-items: flex-start; gap: var(--sp-2); padding: var(--sp-2) var(--sp-4); border-bottom: 1px solid var(--border-dim); flex-shrink: 0; flex-wrap: wrap; }
+  .tagPillRow { display: flex; flex-wrap: wrap; gap: var(--sp-1); flex: 1; min-width: 0; }
+  .tagPill { display: inline-flex; align-items: center; gap: 4px; padding: 2px 7px; background: var(--accent-muted); border: 1px solid var(--accent-dim); border-radius: var(--radius-sm); font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); color: var(--accent-fg); }
+  .tagPillStatus { background: color-mix(in srgb, var(--color-info, #4a90d9) 12%, transparent); border-color: color-mix(in srgb, var(--color-info, #4a90d9) 30%, transparent); color: var(--color-info, #4a90d9); }
+  .tagPillRemove { color: currentColor; opacity: 0.6; font-size: 13px; line-height: 1; background: none; border: none; cursor: pointer; padding: 0; transition: opacity var(--t-base); }
   .tagPillRemove:hover { opacity: 1; }
-  .tagBarRight {
-    display: flex;
-    align-items: center;
-    gap: 4px;
-    flex-shrink: 0;
-  }
-  .tagModeToggle {
-    display: flex;
-    border: 1px solid var(--border-dim);
-    border-radius: var(--radius-md);
-    overflow: hidden;
-  }
-  .tagModeBtn {
-    display: flex;
-    align-items: center;
-    gap: 4px;
-    padding: 4px 8px;
-    font-family: var(--font-ui);
-    font-size: var(--text-2xs);
-    letter-spacing: var(--tracking-wide);
-    color: var(--text-faint);
-    background: none;
-    border: none;
-    border-right: 1px solid var(--border-dim);
-    cursor: pointer;
-    transition: color var(--t-base), background var(--t-base);
-  }
+  .tagBarRight { display: flex; align-items: center; gap: 4px; flex-shrink: 0; }
+  .tagModeToggle { display: flex; border: 1px solid var(--border-dim); border-radius: var(--radius-md); overflow: hidden; }
+  .tagModeBtn { display: flex; align-items: center; gap: 4px; padding: 4px 8px; font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); color: var(--text-faint); background: none; border: none; border-right: 1px solid var(--border-dim); cursor: pointer; transition: color var(--t-base), background var(--t-base); }
   .tagModeBtn:last-child { border-right: none; }
   .tagModeBtn:hover { color: var(--text-muted); background: var(--bg-raised); }
   .tagModeBtnActive { color: var(--accent-fg); background: var(--accent-muted); }
   .tagModeBtnActive:hover { color: var(--accent-fg); background: var(--accent-muted); }
-  .tagClearAll {
-    display: flex;
-    align-items: center;
-    font-family: var(--font-ui);
-    font-size: var(--text-2xs);
-    letter-spacing: var(--tracking-wide);
-    color: var(--text-faint);
-    padding: 4px 8px;
-    border-radius: var(--radius-md);
-    border: 1px solid var(--border-dim);
-    background: none;
-    cursor: pointer;
-    transition: color var(--t-base), border-color var(--t-base), background var(--t-base);
-  }
-  .tagClearAll:hover {
-    color: var(--color-error);
-    border-color: color-mix(in srgb, var(--color-error) 40%, transparent);
-    background: var(--color-error-bg, color-mix(in srgb, var(--color-error) 8%, transparent));
-  }
-  .tagCheckMark {
-    font-size: var(--text-xs);
-    color: var(--accent-fg);
-    margin-left: auto;
-  }
-  .tagGrid {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(110px, 1fr));
-    gap: var(--sp-4);
-    padding: var(--sp-4);
-    overflow-y: auto;
-    flex: 1;
-    align-content: start;
-  }
-  .showMoreCell {
-    grid-column: 1 / -1;
-    display: flex;
-    justify-content: center;
-    gap: var(--sp-2);
-    padding: var(--sp-2) 0;
-  }
-  .showMoreBtn {
-    display: inline-flex;
-    align-items: center;
-    gap: var(--sp-1);
-    padding: 5px 12px;
-    border-radius: var(--radius-md);
-    border: 1px solid var(--border-dim);
-    background: none;
-    font-family: var(--font-ui);
-    font-size: var(--text-xs);
-    letter-spacing: var(--tracking-wide);
-    color: var(--text-muted);
-    cursor: pointer;
-    transition: background var(--t-base), color var(--t-base), border-color var(--t-base);
-  }
-  .showMoreBtn:hover:not(:disabled) {
-    background: var(--bg-raised);
-    color: var(--text-secondary);
-    border-color: var(--border-strong);
-  }
+  .tagClearAll { display: flex; align-items: center; font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); color: var(--text-faint); padding: 4px 8px; border-radius: var(--radius-md); border: 1px solid var(--border-dim); background: none; cursor: pointer; transition: color var(--t-base), border-color var(--t-base), background var(--t-base); }
+  .tagClearAll:hover { color: var(--color-error); border-color: color-mix(in srgb, var(--color-error) 40%, transparent); background: var(--color-error-bg, color-mix(in srgb, var(--color-error) 8%, transparent)); }
+  .tagCheckMark { font-size: var(--text-xs); color: var(--accent-fg); margin-left: auto; }
+  .tagGrid { display: grid; grid-template-columns: repeat(auto-fill, minmax(110px, 1fr)); gap: var(--sp-4); padding: var(--sp-4); overflow-y: auto; flex: 1; align-content: start; }
+  .showMoreCell { grid-column: 1 / -1; display: flex; justify-content: center; gap: var(--sp-2); padding: var(--sp-2) 0; }
+  .showMoreBtn { display: inline-flex; align-items: center; gap: var(--sp-1); padding: 5px 12px; border-radius: var(--radius-md); border: 1px solid var(--border-dim); background: none; font-family: var(--font-ui); font-size: var(--text-xs); letter-spacing: var(--tracking-wide); color: var(--text-muted); cursor: pointer; transition: background var(--t-base), color var(--t-base), border-color var(--t-base); }
+  .showMoreBtn:hover:not(:disabled) { background: var(--bg-raised); color: var(--text-secondary); border-color: var(--border-strong); }
   .showMoreBtn:disabled { opacity: 0.4; cursor: default; }
-  .loadMoreRow {
-    display: flex;
-    justify-content: center;
-    padding: var(--sp-3) var(--sp-4);
-    flex-shrink: 0;
-    border-top: 1px solid var(--border-dim);
-  }
-  .sourceBrowseBar {
-    display: flex;
-    align-items: center;
-    gap: var(--sp-2);
-    padding: var(--sp-2) var(--sp-4);
-    border-bottom: 1px solid var(--border-dim);
-    flex-shrink: 0;
-  }
-  .srcLangRow {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: var(--sp-2) var(--sp-3);
-    border-bottom: 1px solid var(--border-dim);
-    flex-shrink: 0;
-    gap: var(--sp-2);
-  }
-  .langPocketLabel {
-    font-family: var(--font-ui);
-    font-size: var(--text-2xs);
-    color: var(--text-faint);
-    letter-spacing: var(--tracking-wider);
-    text-transform: uppercase;
-  }
-  .langSelect {
-    appearance: none;
-    -webkit-appearance: none;
-    background: var(--bg-overlay);
-    border: 1px solid var(--border-dim);
-    border-radius: var(--radius-sm);
-    color: var(--text-secondary);
-    font-family: var(--font-ui);
-    font-size: var(--text-2xs);
-    letter-spacing: var(--tracking-wide);
-    padding: 4px 24px 4px 8px;
-    cursor: pointer;
-    max-width: 110px;
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 256 256'%3E%3Cpath fill='%23888' d='M213.66,101.66l-80,80a8,8,0,0,1-11.32,0l-80-80A8,8,0,0,1,53.66,90.34L128,164.69l74.34-74.35a8,8,0,0,1,11.32,11.32Z'/%3E%3C/svg%3E");
-    background-repeat: no-repeat;
-    background-position: right 7px center;
-    transition: border-color var(--t-base), background var(--t-base), color var(--t-base);
-  }
-  .langSelect:hover {
-    border-color: var(--border-strong);
-    background-color: var(--bg-raised);
-    color: var(--text-primary);
-  }
-  .langSelect:focus {
-    outline: none;
-    border-color: var(--accent-dim);
-    color: var(--text-primary);
-  }
-  .langSelect option {
-    background: var(--bg-surface);
-    color: var(--text-secondary);
-  }
-  .nsfwBadge {
-    font-family: var(--font-ui);
-    font-size: var(--text-2xs);
-    letter-spacing: var(--tracking-wide);
-    color: var(--color-error);
-    background: var(--color-error-bg, rgba(180, 60, 60, 0.08));
-    border: 1px solid rgba(180, 60, 60, 0.25);
-    border-radius: var(--radius-sm);
-    padding: 1px 5px;
-    margin-left: auto;
-    flex-shrink: 0;
-  }
-  .splitItemGroup { }
-  .splitItemGroupOpen { background: var(--bg-raised); }
+  .loadMoreRow { display: flex; justify-content: center; padding: var(--sp-3) var(--sp-4); flex-shrink: 0; border-top: 1px solid var(--border-dim); }
+  .sourceBrowseBar { display: flex; align-items: center; gap: var(--sp-2); padding: var(--sp-2) var(--sp-4); border-bottom: 1px solid var(--border-dim); flex-shrink: 0; }
+  .srcLangRow { display: flex; align-items: center; justify-content: space-between; padding: var(--sp-2) var(--sp-3); border-bottom: 1px solid var(--border-dim); flex-shrink: 0; gap: var(--sp-2); }
+  .langPocketLabel { font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-faint); letter-spacing: var(--tracking-wider); text-transform: uppercase; }
+  .langSelect { appearance: none; -webkit-appearance: none; background: var(--bg-overlay); border: 1px solid var(--border-dim); border-radius: var(--radius-sm); color: var(--text-secondary); font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); padding: 4px 24px 4px 8px; cursor: pointer; max-width: 110px; background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 256 256'%3E%3Cpath fill='%23888' d='M213.66,101.66l-80,80a8,8,0,0,1-11.32,0l-80-80A8,8,0,0,1,53.66,90.34L128,164.69l74.34-74.35a8,8,0,0,1,11.32,11.32Z'/%3E%3C/svg%3E"); background-repeat: no-repeat; background-position: right 7px center; transition: border-color var(--t-base), background var(--t-base), color var(--t-base); }
+  .langSelect:hover { border-color: var(--border-strong); background-color: var(--bg-raised); color: var(--text-primary); }
+  .langSelect:focus { outline: none; border-color: var(--accent-dim); color: var(--text-primary); }
+  .langSelect option { background: var(--bg-surface); color: var(--text-secondary); }
+  .nsfwBadge { font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); color: var(--color-error); background: var(--color-error-bg, rgba(180, 60, 60, 0.08)); border: 1px solid rgba(180, 60, 60, 0.25); border-radius: var(--radius-sm); padding: 1px 5px; margin-left: auto; flex-shrink: 0; }
 </style>
 
 <script module>
diff --git a/src/lib/queries.ts b/src/lib/queries.ts
index ac42d5a..f0f379c 100644
--- a/src/lib/queries.ts
+++ b/src/lib/queries.ts
@@ -441,8 +441,8 @@ export const GET_SOURCES = `
 `;
 
 export const FETCH_SOURCE_MANGA = `
-  mutation FetchSourceManga($source: LongString!, $type: FetchSourceMangaType!, $page: Int!, $query: String) {
-    fetchSourceManga(input: { source: $source, type: $type, page: $page, query: $query }) {
+  mutation FetchSourceManga($source: LongString!, $type: FetchSourceMangaType!, $page: Int!, $query: String, $filters: [FilterChangeInput!]) {
+    fetchSourceManga(input: { source: $source, type: $type, page: $page, query: $query, filters: $filters }) {
       mangas {
         id
         title