diff --git a/src/lib/components/EventSearch.svelte b/src/lib/components/EventSearch.svelte
index 298ba7d..e4faf0e 100644
--- a/src/lib/components/EventSearch.svelte
+++ b/src/lib/components/EventSearch.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { goto } from '$app/navigation';
+  import { goto } from "$app/navigation";
   import { Input, Button } from "flowbite-svelte";
   import { Spinner } from "flowbite-svelte";
   import type { NDKEvent } from "$lib/utils/nostrUtils";
@@ -8,19 +8,22 @@
     searchBySubscription,
     searchNip05,
   } from "$lib/utils/search_utility";
-  import type { SearchCallbacks } from "$lib/utils/search_types";
   import { neventEncode, naddrEncode, nprofileEncode } from "$lib/utils";
-  import { activeInboxRelays, activeOutboxRelays, getNdkContext } from "$lib/ndk";
+  import {
+    activeInboxRelays,
+    activeOutboxRelays,
+    getNdkContext,
+  } from "$lib/ndk";
   import { getMatchingTags, toNpub } from "$lib/utils/nostrUtils";
   import { isEventId } from "$lib/utils/nostr_identifiers";
-  import type NDK from '@nostr-dev-kit/ndk';
+  import type { SearchType } from "$lib/models/search_type";
 
   // Props definition
   let {
     loading,
     error,
     searchValue,
-    dTagValue,
+    searchType,
     onEventFound,
     onSearchResults,
     event,
@@ -30,7 +33,7 @@
     loading: boolean;
     error: string | null;
     searchValue: string | null;
-    dTagValue: string | null;
+    searchType: SearchType | null;
     onEventFound: (event: NDKEvent) => void;
     onSearchResults: (
       firstOrder: NDKEvent[],
@@ -70,7 +73,7 @@
 
   // Track last processed values to prevent loops
   let lastProcessedSearchValue = $state<string | null>(null);
-  let lastProcessedDTagValue = $state<string | null>(null);
+  let lastProcessedSearchType = $state<SearchType | null>(null);
   let isProcessingSearch = $state(false);
   let currentProcessingSearchValue = $state<string | null>(null);
   let lastSearchValue = $state<string | null>(null);
@@ -110,7 +113,10 @@
         updateSearchState(false, true, 1, "event");
       }
     } catch (err) {
-      handleSearchError(err, "Error fetching event. Please check the ID and try again.");
+      handleSearchError(
+        err,
+        "Error fetching event. Please check the ID and try again.",
+      );
     }
   }
 
@@ -129,7 +135,9 @@
     isResetting = false;
     isUserEditing = false;
 
-    const query = (queryOverride !== undefined ? queryOverride || "" : searchQuery || "").trim();
+    const query = (
+      queryOverride !== undefined ? queryOverride || "" : searchQuery || ""
+    ).trim();
     if (!query) {
       updateSearchState(false, false, null, null);
       return;
@@ -152,67 +160,72 @@
   // AI-NOTE: 2025-01-24 - Helper functions for better code organization
   function getSearchType(query: string): { type: string; term: string } | null {
     const lowerQuery = query.toLowerCase();
-    
+
     if (lowerQuery.startsWith("d:")) {
       const dTag = query.slice(2).trim().toLowerCase();
       return dTag ? { type: "d", term: dTag } : null;
     }
-    
+
     if (lowerQuery.startsWith("t:")) {
       const searchTerm = query.slice(2).trim();
       return searchTerm ? { type: "t", term: searchTerm } : null;
     }
-    
+
     if (lowerQuery.startsWith("n:")) {
       const searchTerm = query.slice(2).trim();
       return searchTerm ? { type: "n", term: searchTerm } : null;
     }
-    
+
     if (query.includes("@")) {
       return { type: "nip05", term: query };
     }
-    
+
     // AI-NOTE: 2025-01-24 - Detect hex IDs (64-character hex strings with no spaces)
     // These are likely event IDs and should be searched as events
     const trimmedQuery = query.trim();
     if (trimmedQuery && isEventId(trimmedQuery)) {
       return { type: "event", term: trimmedQuery };
     }
-    
+
     // AI-NOTE: 2025-01-24 - Treat plain text searches as profile searches by default
     // This allows searching for names like "thebeave" or "TheBeave" without needing n: prefix
-    if (trimmedQuery && !trimmedQuery.startsWith("nevent") && !trimmedQuery.startsWith("npub") && !trimmedQuery.startsWith("naddr")) {
+    if (
+      trimmedQuery &&
+      !trimmedQuery.startsWith("nevent") &&
+      !trimmedQuery.startsWith("npub") &&
+      !trimmedQuery.startsWith("naddr")
+    ) {
       return { type: "n", term: trimmedQuery };
     }
-    
+
     return null;
   }
 
   async function handleSearchByType(
     searchType: { type: string; term: string },
     query: string,
-    clearInput: boolean
+    clearInput: boolean,
   ) {
     const { type, term } = searchType;
-    
+
     if (type === "d") {
       console.log("EventSearch: Processing d-tag search:", term);
       navigateToSearch(term, "d");
       updateSearchState(false, false, null, null);
       return;
     }
-    
+
     if (type === "nip05") {
       await handleNip05Search(term);
       return;
     }
-    
+
     if (type === "event") {
       console.log("EventSearch: Processing event ID search:", term);
       await handleEventSearch(term);
       return;
     }
-    
+
     if (type === "t" || type === "n") {
       await handleSearchBySubscription(type as "t" | "n", term);
       return;
@@ -237,7 +250,7 @@
       }
       activeSub = null;
     }
-    
+
     if (currentAbortController) {
       currentAbortController.abort();
       currentAbortController = null;
@@ -250,10 +263,16 @@
       return;
     }
 
-    if (dTagValue) {
-      searchQuery = `d:${dTagValue}`;
-    } else if (searchValue) {
-      searchQuery = searchValue;
+    if (searchValue && searchType) {
+      if (searchType === "d") {
+        searchQuery = `d:${searchValue}`;
+      } else if (searchType === "t") {
+        searchQuery = `t:${searchValue}`;
+      } else if (searchType === "n") {
+        searchQuery = `n:${searchValue}`;
+      } else {
+        searchQuery = searchValue;
+      }
     } else if (!searchQuery) {
       searchQuery = "";
     }
@@ -282,7 +301,7 @@
     if (searchTimeout) {
       clearTimeout(searchTimeout);
     }
-    
+
     searchTimeout = setTimeout(() => {
       isProcessingSearch = true;
       isWaitingForSearchResult = true;
@@ -303,17 +322,29 @@
 
   $effect(() => {
     if (
-      dTagValue &&
+      searchValue &&
+      searchType &&
       !searching &&
       !isResetting &&
-      dTagValue !== lastProcessedDTagValue
+      (searchType !== lastProcessedSearchType ||
+        searchValue !== lastProcessedSearchValue)
     ) {
-      console.log("EventSearch: Processing dTagValue:", dTagValue);
-      lastProcessedDTagValue = dTagValue;
-      
+      console.log("EventSearch: Processing search:", {
+        searchType,
+        searchValue,
+      });
+      lastProcessedSearchType = searchType;
+      lastProcessedSearchValue = searchValue;
+
       setTimeout(() => {
         if (!searching && !isResetting) {
-          handleSearchBySubscription("d", dTagValue);
+          if (searchType === "d") {
+            handleSearchBySubscription("d", searchValue);
+          } else if (searchType === "t") {
+            handleSearchBySubscription("t", searchValue);
+          } else if (searchType === "n") {
+            handleSearchBySubscription("n", searchValue);
+          }
         }
       }, 100);
     }
@@ -336,13 +367,13 @@
     try {
       currentNevent = neventEncode(event, $activeInboxRelays);
     } catch {}
-    
+
     try {
       currentNaddr = getMatchingTags(event, "d")[0]?.[1]
         ? naddrEncode(event, $activeInboxRelays)
         : null;
     } catch {}
-    
+
     try {
       currentNpub = event.kind === 0 ? toNpub(event.pubkey) : null;
     } catch {}
@@ -386,7 +417,7 @@
     foundEvent = null;
     localError = null;
     lastProcessedSearchValue = null;
-    lastProcessedDTagValue = null;
+    lastProcessedSearchType = null;
     isProcessingSearch = false;
     currentProcessingSearchValue = null;
     lastSearchValue = null;
@@ -421,6 +452,10 @@
       lastSearchValue = searchValue;
     }
 
+    if (searchType) {
+      lastProcessedSearchType = searchType;
+    }
+
     isProcessingSearch = false;
     currentProcessingSearchValue = null;
     isWaitingForSearchResult = false;
@@ -453,9 +488,9 @@
     isResetting = false;
     localError = null;
     updateSearchState(true, false);
-    
+
     await waitForRelays();
-    
+
     try {
       await performSubscriptionSearch(searchType, searchTerm);
     } catch (error) {
@@ -470,52 +505,56 @@
   async function waitForRelays(): Promise<void> {
     let retryCount = 0;
     const maxRetries = 10; // Reduced retry count since we'll use all available relays
-    
+
     // AI-NOTE: 2025-01-24 - Wait for any relays to be available, not just specific types
     // This ensures searches can proceed even if some relay types are not available
     while (retryCount < maxRetries) {
       // Check if we have any relays in the NDK pool
       if (ndk && ndk.pool && ndk.pool.relays && ndk.pool.relays.size > 0) {
-        console.debug(`EventSearch: Found ${ndk.pool.relays.size} relays in NDK pool`);
         break;
       }
-      
-      // Also check active relay stores as fallback
-      if ($activeInboxRelays.length > 0 || $activeOutboxRelays.length > 0) {
-        console.debug(`EventSearch: Found active relays - inbox: ${$activeInboxRelays.length}, outbox: ${$activeOutboxRelays.length}`);
-        break;
-      }
-      
-      console.debug(`EventSearch: Waiting for relays... (attempt ${retryCount + 1}/${maxRetries})`);
-      await new Promise(resolve => setTimeout(resolve, 500));
+
+      await new Promise((resolve) => setTimeout(resolve, 500));
       retryCount++;
     }
-    
+
     // AI-NOTE: 2025-01-24 - Don't fail if no relays are available, let the search functions handle fallbacks
     // The search functions will use all available relays including fallback relays
     const poolRelayCount = ndk?.pool?.relays?.size || 0;
-    
+
     console.log("EventSearch: Relay status for search:", {
       poolRelayCount,
       inboxCount: $activeInboxRelays.length,
       outboxCount: $activeOutboxRelays.length,
-      willUseAllRelays: poolRelayCount > 0 || $activeInboxRelays.length > 0 || $activeOutboxRelays.length > 0
+      willUseAllRelays:
+        poolRelayCount > 0 ||
+        $activeInboxRelays.length > 0 ||
+        $activeOutboxRelays.length > 0,
     });
-    
+
     // If we have any relays available, proceed with search
-    if (poolRelayCount > 0 || $activeInboxRelays.length > 0 || $activeOutboxRelays.length > 0) {
+    if (
+      poolRelayCount > 0 ||
+      $activeInboxRelays.length > 0 ||
+      $activeOutboxRelays.length > 0
+    ) {
       console.log("EventSearch: Relays available, proceeding with search");
     } else {
-      console.warn("EventSearch: No relays detected, but proceeding with search - fallback relays will be used");
+      console.warn(
+        "EventSearch: No relays detected, but proceeding with search - fallback relays will be used",
+      );
     }
   }
 
-  async function performSubscriptionSearch(searchType: "d" | "t" | "n", searchTerm: string): Promise<void> {
+  async function performSubscriptionSearch(
+    searchType: "d" | "t" | "n",
+    searchTerm: string,
+  ): Promise<void> {
     if (currentAbortController) {
       currentAbortController.abort();
     }
     currentAbortController = new AbortController();
-    
+
     const searchPromise = searchBySubscription(
       searchType,
       searchTerm,
@@ -544,16 +583,18 @@
       },
       currentAbortController.signal,
     );
-    
+
     const timeoutPromise = new Promise((_, reject) => {
       setTimeout(() => {
-        reject(new Error("Search timeout: No results received within 30 seconds"));
+        reject(
+          new Error("Search timeout: No results received within 30 seconds"),
+        );
       }, 30000);
     });
-    
-    const result = await Promise.race([searchPromise, timeoutPromise]) as any;
+
+    const result = (await Promise.race([searchPromise, timeoutPromise])) as any;
     console.log("EventSearch: Search completed:", result);
-    
+
     onSearchResults(
       result.events,
       result.secondOrder,
@@ -564,16 +605,19 @@
       searchValue || result.searchTerm, // AI-NOTE: 2025-01-24 - Use original search value for display
       false, // AI-NOTE: 2025-01-24 - Search is complete
     );
-    
-    const totalCount = result.events.length + result.secondOrder.length + result.tTagEvents.length;
+
+    const totalCount =
+      result.events.length +
+      result.secondOrder.length +
+      result.tTagEvents.length;
     localError = null;
-    
+
     cleanupSearch();
     updateSearchState(false, true, totalCount, searchType);
     isProcessingSearch = false;
     currentProcessingSearchValue = null;
     isWaitingForSearchResult = false;
-    
+
     if (searchValue) {
       lastProcessedSearchValue = searchValue;
     }
@@ -586,30 +630,39 @@
       isWaitingForSearchResult = false;
       return;
     }
-    
+
     console.error("EventSearch: Search failed:", error);
-    
+
     if (error instanceof Error) {
-      if (error.message.includes("timeout") || error.message.includes("connection")) {
-        localError = "Search timed out. The relays may be temporarily unavailable. Please try again.";
+      if (
+        error.message.includes("timeout") ||
+        error.message.includes("connection")
+      ) {
+        localError =
+          "Search timed out. The relays may be temporarily unavailable. Please try again.";
       } else if (error.message.includes("NDK not initialized")) {
-        localError = "Nostr client not initialized. Please refresh the page and try again.";
+        localError =
+          "Nostr client not initialized. Please refresh the page and try again.";
       } else {
         localError = `Search failed: ${error.message}`;
       }
     } else {
       localError = "Search failed";
     }
-    
+
     cleanupSearch();
     updateSearchState(false, false, null, null);
     isProcessingSearch = false;
     currentProcessingSearchValue = null;
     isWaitingForSearchResult = false;
-    
+
     if (searchValue) {
       lastProcessedSearchValue = searchValue;
     }
+
+    if (searchType) {
+      lastProcessedSearchType = searchType;
+    }
   }
 
   // AI-NOTE: 2025-01-24 - Background profile search is now handled by centralized searchProfiles function
diff --git a/src/lib/models/search_type.d.ts b/src/lib/models/search_type.d.ts
new file mode 100644
index 0000000..db33e7f
--- /dev/null
+++ b/src/lib/models/search_type.d.ts
@@ -0,0 +1 @@
+export type SearchType = "id" | "d" | "t" | "n";
diff --git a/src/routes/events/+page.svelte b/src/routes/events/+page.svelte
index bb3e9a2..d024149 100644
--- a/src/routes/events/+page.svelte
+++ b/src/routes/events/+page.svelte
@@ -9,7 +9,11 @@
   import CommentBox from "$lib/components/CommentBox.svelte";
   import CommentViewer from "$lib/components/CommentViewer.svelte";
   import { userBadge } from "$lib/snippets/UserSnippets.svelte";
-  import { getMatchingTags, toNpub, getUserMetadata } from "$lib/utils/nostrUtils";
+  import {
+    getMatchingTags,
+    toNpub,
+    getUserMetadata,
+  } from "$lib/utils/nostrUtils";
   import EventInput from "$lib/components/EventInput.svelte";
   import CopyToClipboard from "$lib/components/util/CopyToClipboard.svelte";
   import { neventEncode, naddrEncode } from "$lib/utils";
@@ -19,21 +23,24 @@
   import { checkCommunity } from "$lib/utils/search_utility";
   import EmbeddedEvent from "$lib/components/embedded_events/EmbeddedEvent.svelte";
   import { userStore } from "$lib/stores/userStore";
-  import { fetchCurrentUserLists, isPubkeyInUserLists } from "$lib/utils/user_lists";
+  import {
+    fetchCurrentUserLists,
+    isPubkeyInUserLists,
+  } from "$lib/utils/user_lists";
   import { UserOutline } from "flowbite-svelte-icons";
   import type { UserProfile } from "$lib/models/user_profile";
+  import type { SearchType } from "$lib/models/search_type";
 
   let loading = $state(false);
   let error = $state<string | null>(null);
   let searchValue = $state<string | null>(null);
-  let dTagValue = $state<string | null>(null);
+  let searchType = $state<SearchType | null>(null);
   let event = $state<NDKEvent | null>(null);
   let searchResults = $state<NDKEvent[]>([]);
   let secondOrderResults = $state<NDKEvent[]>([]);
   let tTagResults = $state<NDKEvent[]>([]);
   let originalEventIds = $state<Set<string>>(new Set());
   let originalAddresses = $state<Set<string>>(new Set());
-  let searchType = $state<string | null>(null);
   let searchTerm = $state<string | null>(null);
   let profile = $state<UserProfile | null>(null);
   let userRelayPreference = $state(false);
@@ -45,7 +52,7 @@
   let user = $state<any>(null);
 
   userStore.subscribe((val) => (user = val));
-  
+
   // Get NDK context during component initialization
   const ndk = getNdkContext();
 
@@ -61,25 +68,36 @@
         const parsedProfile = parseProfileContent(newEvent);
         if (parsedProfile) {
           profile = parsedProfile;
-          console.log("[Events Page] Parsed profile data:", parsedProfile);
-          
+
           // If the event doesn't have user list information, fetch it
-          if (typeof parsedProfile.isInUserLists !== 'boolean') {
+          if (typeof parsedProfile.isInUserLists !== "boolean") {
             fetchCurrentUserLists(undefined, ndk)
               .then((userLists) => {
-                const isInLists = isPubkeyInUserLists(newEvent.pubkey, userLists);
+                const isInLists = isPubkeyInUserLists(
+                  newEvent.pubkey,
+                  userLists,
+                );
                 // Update the profile with user list information
                 profile = { ...parsedProfile, isInUserLists: isInLists } as any;
                 // Also update the event's profileData
-                (newEvent as any).profileData = { ...parsedProfile, isInUserLists: isInLists };
+                (newEvent as any).profileData = {
+                  ...parsedProfile,
+                  isInUserLists: isInLists,
+                };
               })
               .catch(() => {
                 profile = { ...parsedProfile, isInUserLists: false } as any;
-                (newEvent as any).profileData = { ...parsedProfile, isInUserLists: false };
+                (newEvent as any).profileData = {
+                  ...parsedProfile,
+                  isInUserLists: false,
+                };
               });
           }
         } else {
-          console.warn("[Events Page] Failed to parse profile content for event:", newEvent.id);
+          console.warn(
+            "[Events Page] Failed to parse profile content for event:",
+            newEvent.id,
+          );
           profile = null;
         }
       } catch (error) {
@@ -89,14 +107,14 @@
     } else {
       profile = null;
     }
-    
+
     // AI-NOTE: 2025-01-24 - Ensure profile is cached for the event author
     if (newEvent.pubkey) {
       cacheProfileForPubkey(newEvent.pubkey);
-      
+
       // Update profile data with user list information
       updateProfileDataWithUserLists([newEvent]);
-      
+
       // Also check community status for the individual event
       if (!communityStatus[newEvent.pubkey]) {
         checkCommunity(newEvent.pubkey)
@@ -120,7 +138,10 @@
         console.log(`[Events Page] Cached profile for pubkey: ${pubkey}`);
       }
     } catch (error) {
-      console.warn(`[Events Page] Failed to cache profile for ${pubkey}:`, error);
+      console.warn(
+        `[Events Page] Failed to cache profile for ${pubkey}:`,
+        error,
+      );
     }
   }
 
@@ -128,69 +149,63 @@
   async function updateProfileDataWithUserLists(events: NDKEvent[]) {
     try {
       const userLists = await fetchCurrentUserLists(undefined, ndk);
-      
+
       for (const event of events) {
         if (event.kind === 0 && event.pubkey) {
-          const existingProfileData = (event as any).profileData || parseProfileContent(event);
-          
+          const existingProfileData =
+            (event as any).profileData || parseProfileContent(event);
+
           if (existingProfileData) {
             const isInLists = isPubkeyInUserLists(event.pubkey, userLists);
-            (event as any).profileData = { ...existingProfileData, isInUserLists: isInLists };
+            (event as any).profileData = {
+              ...existingProfileData,
+              isInUserLists: isInLists,
+            };
           }
         }
       }
     } catch (error) {
-      console.warn("[Events Page] Failed to update profile data with user lists:", error);
+      console.warn(
+        "[Events Page] Failed to update profile data with user lists:",
+        error,
+      );
     }
   }
 
-  // Use Svelte 5 idiomatic effect to update searchValue when $page.url.searchParams.get('id') changes
+  // Use Svelte 5 idiomatic effect to update searchValue and searchType based on URL parameters
   $effect(() => {
     const url = $page.url.searchParams;
     const idParam = url.get("id");
     const dParam = url.get("d");
-    
+    const tParam = url.get("t");
+    const nParam = url.get("n");
+
     if (idParam) {
       searchValue = idParam;
-      dTagValue = null;
+      searchType = "id";
     } else if (dParam) {
-      searchValue = null;
-      dTagValue = dParam.toLowerCase();
+      searchValue = dParam.toLowerCase();
+      searchType = "d";
+    } else if (tParam) {
+      searchValue = decodeURIComponent(tParam);
+      searchType = "t";
+    } else if (nParam) {
+      searchValue = decodeURIComponent(nParam);
+      searchType = "n";
     } else {
       searchValue = null;
-      dTagValue = null;
-    }
-  });
-
-  // Add support for t and n parameters
-  $effect(() => {
-    const url = $page.url.searchParams;
-    const tParam = url.get("t");
-    const nParam = url.get("n");
-
-    if (tParam) {
-      // Decode the t parameter and set it as searchValue with t: prefix
-      const decodedT = decodeURIComponent(tParam);
-      searchValue = `t:${decodedT}`;
-      dTagValue = null;
-    } else if (nParam) {
-      // Decode the n parameter and set it as searchValue with n: prefix
-      const decodedN = decodeURIComponent(nParam);
-      searchValue = `n:${decodedN}`;
-      dTagValue = null;
+      searchType = null;
     }
   });
 
   // Handle side panel visibility based on search type
   $effect(() => {
-    const url = $page.url.searchParams;
-    const hasIdParam = url.get("id");
-    const hasDParam = url.get("d");
-    const hasTParam = url.get("t");
-    const hasNParam = url.get("n");
-
-    // Close side panel for searches that return multiple results
-    if (hasDParam || hasTParam || hasNParam) {
+    // Close side panel for searches that return multiple results (d-tag, t-tag, name searches)
+    if (
+      searchType === "d" ||
+      searchType === "t" ||
+      searchType === "n"
+    ) {
       showSidePanel = false;
       event = null;
       profile = null;
@@ -200,11 +215,14 @@
   // AI-NOTE: 2025-01-24 - Function to ensure events have created_at property
   // This fixes the "Unknown date" issue when events are retrieved from cache
   function ensureEventProperties(events: NDKEvent[]): NDKEvent[] {
-    return events.map(event => {
-      if (event && typeof event === 'object') {
+    return events.map((event) => {
+      if (event && typeof event === "object") {
         // Ensure created_at is set
         if (!event.created_at && event.created_at !== 0) {
-          console.warn("[Events Page] Event missing created_at, setting to 0:", event.id);
+          console.warn(
+            "[Events Page] Event missing created_at, setting to 0:",
+            event.id,
+          );
           (event as any).created_at = 0;
         }
       }
@@ -225,13 +243,13 @@
     const processedResults = ensureEventProperties(results);
     const processedSecondOrder = ensureEventProperties(secondOrder);
     const processedTTagEvents = ensureEventProperties(tTagEvents);
-    
+
     searchResults = processedResults;
     secondOrderResults = processedSecondOrder;
     tTagResults = processedTTagEvents;
     originalEventIds = eventIds;
     originalAddresses = addresses;
-    searchType = searchTypeParam || null;
+    searchType = searchTypeParam as SearchType | null;
     searchTerm = searchTermParam || null;
 
     // Track search progress
@@ -279,21 +297,21 @@
   // AI-NOTE: 2025-01-24 - Function to cache profiles for multiple events
   async function cacheProfilesForEvents(events: NDKEvent[]) {
     const uniquePubkeys = new Set<string>();
-    events.forEach(event => {
+    events.forEach((event) => {
       if (event.pubkey) {
         uniquePubkeys.add(event.pubkey);
       }
     });
-    
-    console.log(`[Events Page] Caching profiles for ${uniquePubkeys.size} unique pubkeys`);
-    
+
     // Cache profiles in parallel
-    const cachePromises = Array.from(uniquePubkeys).map(pubkey => cacheProfileForPubkey(pubkey));
+    const cachePromises = Array.from(uniquePubkeys).map((pubkey) =>
+      cacheProfileForPubkey(pubkey),
+    );
     await Promise.allSettled(cachePromises);
-    
+
     // AI-NOTE: 2025-01-24 - Update profile data with user list information for cached events
     await updateProfileDataWithUserLists(events);
-    
+
     console.log(`[Events Page] Profile caching complete`);
   }
 
@@ -447,13 +465,18 @@
 
     communityStatus = { ...communityStatus, ...newCommunityStatus };
   }
-
 </script>
 
 <div class="w-full flex justify-center">
-  <div class="flex flex-col lg:flex-row w-full max-w-7xl my-6 px-4 mx-auto gap-6">
+  <div
+    class="flex flex-col lg:flex-row w-full max-w-7xl my-6 px-4 mx-auto gap-6"
+  >
     <!-- Left Panel: Search and Results -->
-    <div class={showSidePanel ? "w-full lg:w-80 lg:min-w-80" : "flex-1 max-w-4xl mx-auto"}>
+    <div
+      class={showSidePanel
+        ? "w-full lg:w-80 lg:min-w-80"
+        : "flex-1 max-w-4xl mx-auto"}
+    >
       <div class="main-leather flex flex-col space-y-6">
         <div class="flex justify-between items-center">
           <Heading tag="h1" class="h-leather mb-2">Events</Heading>
@@ -480,22 +503,37 @@
         <P class="mb-3">
           Search and explore Nostr events across the network. Find events by:
         </P>
-        <ul class="mb-3 list-disc list-inside space-y-1 text-sm text-gray-700 dark:text-gray-300">
-          <li><strong>Event identifiers:</strong> nevent, note, naddr, npub, nprofile, pubkey, or event ID</li>
+        <ul
+          class="mb-3 list-disc list-inside space-y-1 text-sm text-gray-700 dark:text-gray-300"
+        >
+          <li>
+            <strong>Event identifiers:</strong> nevent, note, naddr, npub, nprofile,
+            pubkey, or event ID
+          </li>
           <li><strong>NIP-05 addresses:</strong> username@domain.com</li>
-          <li><strong>Profile names:</strong> Search by display name or username (use "n:" prefix for exact matches)</li>
-          <li><strong>D-tags:</strong> Find events with specific d-tags using "d:tag-name"</li>
-          <li><strong>T-tags:</strong> Find events tagged with specific topics using "t:topic"</li>
+          <li>
+            <strong>Profile names:</strong> Search by display name or username (use
+            "n:" prefix for exact matches)
+          </li>
+          <li>
+            <strong>D-tags:</strong> Find events with specific d-tags using "d:tag-name"
+          </li>
+          <li>
+            <strong>T-tags:</strong> Find events tagged with specific topics using
+            "t:topic"
+          </li>
         </ul>
         <P class="mb-3 text-sm text-gray-600 dark:text-gray-400">
-          The page shows primary search results, second-order references (replies, quotes, mentions), and related tagged events. Click any event to view details, comments, and relay information.
+          The page shows primary search results, second-order references
+          (replies, quotes, mentions), and related tagged events. Click any
+          event to view details, comments, and relay information.
         </P>
 
         <EventSearch
           {loading}
           {error}
           {searchValue}
-          {dTagValue}
+          {searchType}
           {event}
           onEventFound={handleEventFound}
           onSearchResults={handleSearchResults}
@@ -513,501 +551,596 @@
 
         {#if searchResults.length > 0}
           <div class="mt-8">
-            <div class={showSidePanel && searchResultsCollapsed ? "lg:block hidden" : "block"}>
+            <div
+              class={showSidePanel && searchResultsCollapsed
+                ? "lg:block hidden"
+                : "block"}
+            >
               <Heading tag="h2" class="h-leather mb-4 break-words">
                 {#if searchType === "n"}
-                  Search Results for name: "{searchTerm && searchTerm.length > 50 ? searchTerm.slice(0, 50) + '...' : searchTerm || ''}" ({searchResults.length} profiles)
+                  Search Results for name: "{searchTerm &&
+                  searchTerm.length > 50
+                    ? searchTerm.slice(0, 50) + "..."
+                    : searchTerm || ""}" ({searchResults.length} profiles)
                 {:else if searchType === "t"}
-                  Search Results for t-tag: "{searchTerm && searchTerm.length > 50 ? searchTerm.slice(0, 50) + '...' : searchTerm || ''}" ({searchResults.length}
+                  Search Results for t-tag: "{searchTerm &&
+                  searchTerm.length > 50
+                    ? searchTerm.slice(0, 50) + "..."
+                    : searchTerm || ""}" ({searchResults.length}
                   events)
                 {:else}
                   Search Results for d-tag: "{(() => {
-                    const term = searchTerm || dTagValue?.toLowerCase() || '';
-                    return term.length > 50 ? term.slice(0, 50) + '...' : term;
+                    const term =
+                      searchTerm ||
+                      (searchType === "d" ? searchValue : "") ||
+                      "";
+                    return term.length > 50 ? term.slice(0, 50) + "..." : term;
                   })()}" ({searchResults.length} events)
                 {/if}
               </Heading>
-            <div class="space-y-4">
-              {#each searchResults as result, index}
-                {@const profileData = (result as any).profileData || parseProfileContent(result)}
-                <button
-                  class="w-full text-left border border-gray-300 dark:border-gray-600 rounded-lg p-4 bg-white dark:bg-primary-900/70 hover:bg-gray-100 dark:hover:bg-primary-800 focus:bg-gray-100 dark:focus:bg-primary-800 focus:outline-none focus:ring-2 focus:ring-primary-500 transition-colors overflow-hidden"
-                  onclick={() => handleEventFound(result)}
-                >
-                  <div class="flex flex-col gap-1">
-                    <div class="flex items-center gap-2 mb-1">
-                      <span class="font-medium text-gray-800 dark:text-gray-100"
-                        >{searchType === "n" ? "Profile" : "Event"}
-                        {index + 1}</span
-                      >
-                      <span class="text-xs text-gray-600 dark:text-gray-400"
-                        >Kind: {result.kind}</span
-                      >
-                      {#if profileData?.isInUserLists}
-                        <div
-                          class="flex-shrink-0 w-4 h-4 bg-red-100 dark:bg-red-900 rounded-full flex items-center justify-center"
-                          title="In your lists (follows, etc.)"
+              <div class="space-y-4">
+                {#each searchResults as result, index}
+                  {@const profileData =
+                    (result as any).profileData || parseProfileContent(result)}
+                  <button
+                    class="w-full text-left border border-gray-300 dark:border-gray-600 rounded-lg p-4 bg-white dark:bg-primary-900/70 hover:bg-gray-100 dark:hover:bg-primary-800 focus:bg-gray-100 dark:focus:bg-primary-800 focus:outline-none focus:ring-2 focus:ring-primary-500 transition-colors overflow-hidden"
+                    onclick={() => handleEventFound(result)}
+                  >
+                    <div class="flex flex-col gap-1">
+                      <div class="flex items-center gap-2 mb-1">
+                        <span
+                          class="font-medium text-gray-800 dark:text-gray-100"
+                          >{searchType === "n" ? "Profile" : "Event"}
+                          {index + 1}</span
                         >
-                          <svg
-                            class="w-3 h-3 text-red-600 dark:text-red-400"
-                            fill="currentColor"
-                            viewBox="0 0 24 24"
-                          >
-                            <path
-                              d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z"
-                            />
-                          </svg>
-                        </div>
-                      {:else if result.pubkey && communityStatus[result.pubkey]}
-                        <div
-                          class="flex-shrink-0 w-4 h-4 bg-yellow-100 dark:bg-yellow-900 rounded-full flex items-center justify-center"
-                          title="Has posted to the community"
+                        <span class="text-xs text-gray-600 dark:text-gray-400"
+                          >Kind: {result.kind}</span
                         >
-                          <svg
-                            class="w-3 h-3 text-yellow-600 dark:text-yellow-400"
-                            fill="currentColor"
-                            viewBox="0 0 24 24"
+                        {#if profileData?.isInUserLists}
+                          <div
+                            class="flex-shrink-0 w-4 h-4 bg-red-100 dark:bg-red-900 rounded-full flex items-center justify-center"
+                            title="In your lists (follows, etc.)"
                           >
-                            <path
-                              d="M12 2l3.09 6.26L22 9.27l-5 4.87 1.18 6.88L12 17.77l-6.18 3.25L7 14.14 2 9.27l6.91-1.01L12 2z"
-                            />
-                          </svg>
-                        </div>
-                      {:else}
-                        <div class="flex-shrink-0 w-4 h-4"></div>
-                      {/if}
-                      <span class="text-xs text-gray-600 dark:text-gray-400">
-                        {@render userBadge(
-                          toNpub(result.pubkey) as string,
-                          profileData?.display_name || profileData?.name,
-                        )}
-                      </span>
-                      <span
-                        class="text-xs text-gray-500 dark:text-gray-400 ml-auto"
-                      >
-                        {result.created_at
-                          ? new Date(
-                              result.created_at * 1000,
-                            ).toLocaleDateString()
-                          : "Unknown date"}
-                      </span>
-                    </div>
-                    {#if result.kind === 0 && profileData}
-                      <div class="flex items-center gap-3 mb-2">
-                        {#if profileData.picture}
-                          <img
-                            src={profileData.picture}
-                            alt="Profile"
-                            class="w-12 h-12 rounded-full object-cover border border-gray-200 dark:border-gray-600"
-                            onerror={(e) => {
-                              (e.target as HTMLImageElement).style.display = 'none';
-                              (e.target as HTMLImageElement).nextElementSibling?.classList.remove('hidden');
-                            }}
-                          />
-                          <div class="w-12 h-12 rounded-full bg-gray-300 dark:bg-gray-600 flex items-center justify-center border border-gray-200 dark:border-gray-600 hidden">
-                            <UserOutline class="w-6 h-6 text-gray-600 dark:text-gray-300" />
+                            <svg
+                              class="w-3 h-3 text-red-600 dark:text-red-400"
+                              fill="currentColor"
+                              viewBox="0 0 24 24"
+                            >
+                              <path
+                                d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z"
+                              />
+                            </svg>
                           </div>
-                        {:else}
-                          <div class="w-12 h-12 rounded-full bg-gray-300 dark:bg-gray-600 flex items-center justify-center border border-gray-200 dark:border-gray-600">
-                            <UserOutline class="w-6 h-6 text-gray-600 dark:text-gray-300" />
+                        {:else if result.pubkey && communityStatus[result.pubkey]}
+                          <div
+                            class="flex-shrink-0 w-4 h-4 bg-yellow-100 dark:bg-yellow-900 rounded-full flex items-center justify-center"
+                            title="Has posted to the community"
+                          >
+                            <svg
+                              class="w-3 h-3 text-yellow-600 dark:text-yellow-400"
+                              fill="currentColor"
+                              viewBox="0 0 24 24"
+                            >
+                              <path
+                                d="M12 2l3.09 6.26L22 9.27l-5 4.87 1.18 6.88L12 17.77l-6.18 3.25L7 14.14 2 9.27l6.91-1.01L12 2z"
+                              />
+                            </svg>
                           </div>
+                        {:else}
+                          <div class="flex-shrink-0 w-4 h-4"></div>
                         {/if}
-                        <div class="flex flex-col min-w-0 flex-1">
-                          {#if profileData.display_name || profileData.name}
-                            <span class="font-medium text-gray-900 dark:text-gray-100 truncate">
-                              {profileData.display_name || profileData.name}
-                            </span>
-                          {/if}
-                          {#if profileData.about}
-                            <span class="text-sm text-gray-600 dark:text-gray-400 line-clamp-2">
-                              {profileData.about}
-                            </span>
-                          {/if}
-                        </div>
-                      </div>
-                    {:else}
-                      {#if getSummary(result)}
-                        <div
-                          class="text-sm text-primary-900 dark:text-primary-200 mb-1 line-clamp-2"
+                        <span class="text-xs text-gray-600 dark:text-gray-400">
+                          {@render userBadge(
+                            toNpub(result.pubkey) as string,
+                            profileData?.display_name || profileData?.name,
+                          )}
+                        </span>
+                        <span
+                          class="text-xs text-gray-500 dark:text-gray-400 ml-auto"
                         >
-                          {getSummary(result)}
+                          {result.created_at
+                            ? new Date(
+                                result.created_at * 1000,
+                              ).toLocaleDateString()
+                            : "Unknown date"}
+                        </span>
+                      </div>
+                      {#if result.kind === 0 && profileData}
+                        <div class="flex items-center gap-3 mb-2">
+                          {#if profileData.picture}
+                            <img
+                              src={profileData.picture}
+                              alt="Profile"
+                              class="w-12 h-12 rounded-full object-cover border border-gray-200 dark:border-gray-600"
+                              onerror={(e) => {
+                                (e.target as HTMLImageElement).style.display =
+                                  "none";
+                                (
+                                  e.target as HTMLImageElement
+                                ).nextElementSibling?.classList.remove(
+                                  "hidden",
+                                );
+                              }}
+                            />
+                            <div
+                              class="w-12 h-12 rounded-full bg-gray-300 dark:bg-gray-600 flex items-center justify-center border border-gray-200 dark:border-gray-600 hidden"
+                            >
+                              <UserOutline
+                                class="w-6 h-6 text-gray-600 dark:text-gray-300"
+                              />
+                            </div>
+                          {:else}
+                            <div
+                              class="w-12 h-12 rounded-full bg-gray-300 dark:bg-gray-600 flex items-center justify-center border border-gray-200 dark:border-gray-600"
+                            >
+                              <UserOutline
+                                class="w-6 h-6 text-gray-600 dark:text-gray-300"
+                              />
+                            </div>
+                          {/if}
+                          <div class="flex flex-col min-w-0 flex-1">
+                            {#if profileData.display_name || profileData.name}
+                              <span
+                                class="font-medium text-gray-900 dark:text-gray-100 truncate"
+                              >
+                                {profileData.display_name || profileData.name}
+                              </span>
+                            {/if}
+                            {#if profileData.about}
+                              <span
+                                class="text-sm text-gray-600 dark:text-gray-400 line-clamp-2"
+                              >
+                                {profileData.about}
+                              </span>
+                            {/if}
+                          </div>
                         </div>
-                      {/if}
-                      {#if getDeferralNaddr(result)}
-                        <div
-                          class="text-xs text-primary-800 dark:text-primary-300 mb-1"
-                        >
-                          Read
-                          <span
-                            class="underline text-primary-700 dark:text-primary-400 hover:text-primary-900 dark:hover:text-primary-200 break-all cursor-pointer"
-                            onclick={(e) => {
-                              e.stopPropagation();
-                              navigateToPublication(
-                                getDeferralNaddr(result) || "",
-                              );
-                            }}
-                            onkeydown={(e) => {
-                              if (e.key === "Enter" || e.key === " ") {
-                                e.preventDefault();
+                      {:else}
+                        {#if getSummary(result)}
+                          <div
+                            class="text-sm text-primary-900 dark:text-primary-200 mb-1 line-clamp-2"
+                          >
+                            {getSummary(result)}
+                          </div>
+                        {/if}
+                        {#if getDeferralNaddr(result)}
+                          <div
+                            class="text-xs text-primary-800 dark:text-primary-300 mb-1"
+                          >
+                            Read
+                            <span
+                              class="underline text-primary-700 dark:text-primary-400 hover:text-primary-900 dark:hover:text-primary-200 break-all cursor-pointer"
+                              onclick={(e) => {
                                 e.stopPropagation();
                                 navigateToPublication(
                                   getDeferralNaddr(result) || "",
                                 );
-                              }
-                            }}
-                            tabindex="0"
-                            role="button"
+                              }}
+                              onkeydown={(e) => {
+                                if (e.key === "Enter" || e.key === " ") {
+                                  e.preventDefault();
+                                  e.stopPropagation();
+                                  navigateToPublication(
+                                    getDeferralNaddr(result) || "",
+                                  );
+                                }
+                              }}
+                              tabindex="0"
+                              role="button"
+                            >
+                              {getDeferralNaddr(result)}
+                            </span>
+                          </div>
+                        {/if}
+                        {#if isAddressableEvent(result)}
+                          <div
+                            class="text-xs text-blue-600 dark:text-blue-400 mb-1"
                           >
-                            {getDeferralNaddr(result)}
-                          </span>
-                        </div>
-                      {/if}
-                      {#if isAddressableEvent(result)}
-                        <div
-                          class="text-xs text-blue-600 dark:text-blue-400 mb-1"
-                        >
-                          <ViewPublicationLink event={result} />
-                        </div>
-                      {/if}
-                      {#if result.content}
-                        <div
-                          class="text-sm text-gray-800 dark:text-gray-200 mt-1 line-clamp-2 break-words"
-                        >
-                          <EmbeddedEvent nostrIdentifier={result.id} nestingLevel={0} />
-                        </div>
+                            <ViewPublicationLink event={result} />
+                          </div>
+                        {/if}
+                        {#if result.content}
+                          <div
+                            class="text-sm text-gray-800 dark:text-gray-200 mt-1 line-clamp-2 break-words"
+                          >
+                            <EmbeddedEvent
+                              nostrIdentifier={result.id}
+                              nestingLevel={0}
+                            />
+                          </div>
+                        {/if}
                       {/if}
-                    {/if}
-                  </div>
-                </button>
-              {/each}
-            </div>
+                    </div>
+                  </button>
+                {/each}
+              </div>
             </div>
           </div>
         {/if}
 
         {#if secondOrderResults.length > 0}
           <div class="mt-8">
-            <div class={showSidePanel && searchResultsCollapsed ? "lg:block hidden" : "block"}>
+            <div
+              class={showSidePanel && searchResultsCollapsed
+                ? "lg:block hidden"
+                : "block"}
+            >
               <Heading tag="h2" class="h-leather mb-4">
                 Second-Order Events (References, Replies, Quotes) ({secondOrderResults.length}
                 events)
               </Heading>
-            {#if (searchType === "n" || searchType === "d") && secondOrderResults.length === 100}
+              {#if (searchType === "n" || searchType === "d") && secondOrderResults.length === 100}
+                <P class="mb-4 text-sm text-gray-600 dark:text-gray-400">
+                  Showing the 100 newest events. More results may be available.
+                </P>
+              {/if}
               <P class="mb-4 text-sm text-gray-600 dark:text-gray-400">
-                Showing the 100 newest events. More results may be available.
+                Events that reference, reply to, highlight, or quote the
+                original events.
               </P>
-            {/if}
-            <P class="mb-4 text-sm text-gray-600 dark:text-gray-400">
-              Events that reference, reply to, highlight, or quote the original
-              events.
-            </P>
-            <div class="space-y-4">
-              {#each secondOrderResults as result, index}
-                {@const profileData = (result as any).profileData || parseProfileContent(result)}
-                <button
-                  class="w-full text-left border border-gray-300 dark:border-gray-600 rounded-lg p-4 bg-gray-50 dark:bg-primary-800/50 hover:bg-gray-100 dark:hover:bg-primary-700 focus:bg-gray-100 dark:focus:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-primary-500 transition-colors overflow-hidden"
-                  onclick={() => handleEventFound(result)}
-                >
-                  <div class="flex flex-col gap-1">
-                    <div class="flex items-center gap-2 mb-1">
-                      <span class="font-medium text-gray-800 dark:text-gray-100"
-                        >Reference {index + 1}</span
-                      >
-                      <span class="text-xs text-gray-600 dark:text-gray-400"
-                        >Kind: {result.kind}</span
-                      >
-                      {#if result.pubkey && communityStatus[result.pubkey]}
-                        <div
-                          class="flex-shrink-0 w-4 h-4 bg-yellow-100 dark:bg-yellow-900 rounded-full flex items-center justify-center"
-                          title="Has posted to the community"
+              <div class="space-y-4">
+                {#each secondOrderResults as result, index}
+                  {@const profileData =
+                    (result as any).profileData || parseProfileContent(result)}
+                  <button
+                    class="w-full text-left border border-gray-300 dark:border-gray-600 rounded-lg p-4 bg-gray-50 dark:bg-primary-800/50 hover:bg-gray-100 dark:hover:bg-primary-700 focus:bg-gray-100 dark:focus:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-primary-500 transition-colors overflow-hidden"
+                    onclick={() => handleEventFound(result)}
+                  >
+                    <div class="flex flex-col gap-1">
+                      <div class="flex items-center gap-2 mb-1">
+                        <span
+                          class="font-medium text-gray-800 dark:text-gray-100"
+                          >Reference {index + 1}</span
+                        >
+                        <span class="text-xs text-gray-600 dark:text-gray-400"
+                          >Kind: {result.kind}</span
                         >
-                          <svg
-                            class="w-3 h-3 text-yellow-600 dark:text-yellow-400"
-                            fill="currentColor"
-                            viewBox="0 0 24 24"
+                        {#if result.pubkey && communityStatus[result.pubkey]}
+                          <div
+                            class="flex-shrink-0 w-4 h-4 bg-yellow-100 dark:bg-yellow-900 rounded-full flex items-center justify-center"
+                            title="Has posted to the community"
                           >
-                            <path
-                              d="M12 2l3.09 6.26L22 9.27l-5 4.87 1.18 6.88L12 17.77l-6.18 3.25L7 14.14 2 9.27l6.91-1.01L12 2z"
+                            <svg
+                              class="w-3 h-3 text-yellow-600 dark:text-yellow-400"
+                              fill="currentColor"
+                              viewBox="0 0 24 24"
+                            >
+                              <path
+                                d="M12 2l3.09 6.26L22 9.27l-5 4.87 1.18 6.88L12 17.77l-6.18 3.25L7 14.14 2 9.27l6.91-1.01L12 2z"
+                              />
+                            </svg>
+                          </div>
+                        {:else}
+                          <div class="flex-shrink-0 w-4 h-4"></div>
+                        {/if}
+                        <span class="text-xs text-gray-600 dark:text-gray-400">
+                          {@render userBadge(
+                            toNpub(result.pubkey) as string,
+                            profileData?.display_name || profileData?.name,
+                          )}
+                        </span>
+                        <span
+                          class="text-xs text-gray-500 dark:text-gray-400 ml-auto"
+                        >
+                          {result.created_at
+                            ? new Date(
+                                result.created_at * 1000,
+                              ).toLocaleDateString()
+                            : "Unknown date"}
+                        </span>
+                      </div>
+                      <div
+                        class="text-xs text-blue-600 dark:text-blue-400 mb-1"
+                      >
+                        {getReferenceType(
+                          result,
+                          originalEventIds,
+                          originalAddresses,
+                        )}
+                      </div>
+                      {#if result.kind === 0 && profileData}
+                        <div class="flex items-center gap-3 mb-2">
+                          {#if profileData.picture}
+                            <img
+                              src={profileData.picture}
+                              alt="Profile"
+                              class="w-12 h-12 rounded-full object-cover border border-gray-200 dark:border-gray-600"
+                              onerror={(e) => {
+                                (e.target as HTMLImageElement).style.display =
+                                  "none";
+                              }}
                             />
-                          </svg>
+                          {:else}
+                            <div
+                              class="w-12 h-12 rounded-full bg-gray-300 dark:bg-gray-600 flex items-center justify-center border border-gray-200 dark:border-gray-600"
+                            >
+                              <span
+                                class="text-lg font-medium text-gray-600 dark:text-gray-300"
+                              >
+                                {(
+                                  profileData.display_name ||
+                                  profileData.name ||
+                                  result.pubkey.slice(0, 1)
+                                ).toUpperCase()}
+                              </span>
+                            </div>
+                          {/if}
+                          <div class="flex flex-col min-w-0 flex-1">
+                            {#if profileData.display_name || profileData.name}
+                              <span
+                                class="font-medium text-gray-900 dark:text-gray-100 truncate"
+                              >
+                                {profileData.display_name || profileData.name}
+                              </span>
+                            {/if}
+                            {#if profileData.about}
+                              <span
+                                class="text-sm text-gray-600 dark:text-gray-400 line-clamp-2"
+                              >
+                                {profileData.about}
+                              </span>
+                            {/if}
+                          </div>
                         </div>
                       {:else}
-                        <div class="flex-shrink-0 w-4 h-4"></div>
-                      {/if}
-                      <span class="text-xs text-gray-600 dark:text-gray-400">
-                        {@render userBadge(
-                          toNpub(result.pubkey) as string,
-                          profileData?.display_name || profileData?.name,
-                        )}
-                      </span>
-                      <span
-                        class="text-xs text-gray-500 dark:text-gray-400 ml-auto"
-                      >
-                        {result.created_at
-                          ? new Date(
-                              result.created_at * 1000,
-                            ).toLocaleDateString()
-                          : "Unknown date"}
-                      </span>
-                    </div>
-                    <div class="text-xs text-blue-600 dark:text-blue-400 mb-1">
-                      {getReferenceType(
-                        result,
-                        originalEventIds,
-                        originalAddresses,
-                      )}
-                    </div>
-                    {#if result.kind === 0 && profileData}
-                      <div class="flex items-center gap-3 mb-2">
-                        {#if profileData.picture}
-                          <img
-                            src={profileData.picture}
-                            alt="Profile"
-                            class="w-12 h-12 rounded-full object-cover border border-gray-200 dark:border-gray-600"
-                            onerror={(e) => {
-                              (e.target as HTMLImageElement).style.display = 'none';
-                            }}
-                          />
-                        {:else}
-                          <div class="w-12 h-12 rounded-full bg-gray-300 dark:bg-gray-600 flex items-center justify-center border border-gray-200 dark:border-gray-600">
-                            <span class="text-lg font-medium text-gray-600 dark:text-gray-300">
-                              {(profileData.display_name || profileData.name || result.pubkey.slice(0, 1)).toUpperCase()}
-                            </span>
+                        {#if getSummary(result)}
+                          <div
+                            class="text-sm text-primary-900 dark:text-primary-200 mb-1 line-clamp-2"
+                          >
+                            {getSummary(result)}
                           </div>
                         {/if}
-                        <div class="flex flex-col min-w-0 flex-1">
-                          {#if profileData.display_name || profileData.name}
-                            <span class="font-medium text-gray-900 dark:text-gray-100 truncate">
-                              {profileData.display_name || profileData.name}
-                            </span>
-                          {/if}
-                          {#if profileData.about}
-                            <span class="text-sm text-gray-600 dark:text-gray-400 line-clamp-2">
-                              {profileData.about}
-                            </span>
-                          {/if}
-                        </div>
-                      </div>
-                    {:else}
-                      {#if getSummary(result)}
-                        <div
-                          class="text-sm text-primary-900 dark:text-primary-200 mb-1 line-clamp-2"
-                        >
-                          {getSummary(result)}
-                        </div>
-                      {/if}
-                      {#if getDeferralNaddr(result)}
-                        <div
-                          class="text-xs text-primary-800 dark:text-primary-300 mb-1"
-                        >
-                          Read
-                          <span
-                            class="underline text-primary-700 dark:text-primary-400 hover:text-primary-900 dark:hover:text-primary-200 break-all cursor-pointer"
-                            onclick={(e) => {
-                              e.stopPropagation();
-                              navigateToPublication(
-                                getDeferralNaddr(result) || "",
-                              );
-                            }}
-                            onkeydown={(e) => {
-                              if (e.key === "Enter" || e.key === " ") {
-                                e.preventDefault();
+                        {#if getDeferralNaddr(result)}
+                          <div
+                            class="text-xs text-primary-800 dark:text-primary-300 mb-1"
+                          >
+                            Read
+                            <span
+                              class="underline text-primary-700 dark:text-primary-400 hover:text-primary-900 dark:hover:text-primary-200 break-all cursor-pointer"
+                              onclick={(e) => {
                                 e.stopPropagation();
                                 navigateToPublication(
                                   getDeferralNaddr(result) || "",
                                 );
-                              }
-                            }}
-                            tabindex="0"
-                            role="button"
+                              }}
+                              onkeydown={(e) => {
+                                if (e.key === "Enter" || e.key === " ") {
+                                  e.preventDefault();
+                                  e.stopPropagation();
+                                  navigateToPublication(
+                                    getDeferralNaddr(result) || "",
+                                  );
+                                }
+                              }}
+                              tabindex="0"
+                              role="button"
+                            >
+                              {getDeferralNaddr(result)}
+                            </span>
+                          </div>
+                        {/if}
+                        {#if isAddressableEvent(result)}
+                          <div
+                            class="text-xs text-blue-600 dark:text-blue-400 mb-1"
                           >
-                            {getDeferralNaddr(result)}
-                          </span>
-                        </div>
-                      {/if}
-                      {#if isAddressableEvent(result)}
-                        <div
-                          class="text-xs text-blue-600 dark:text-blue-400 mb-1"
-                        >
-                          <ViewPublicationLink event={result} />
-                        </div>
-                      {/if}
-                      {#if result.content}
-                        <div
-                          class="text-sm text-gray-800 dark:text-gray-200 mt-1 line-clamp-2 break-words"
-                        >
-                          <EmbeddedEvent nostrIdentifier={result.id} nestingLevel={0} />
-                        </div>
+                            <ViewPublicationLink event={result} />
+                          </div>
+                        {/if}
+                        {#if result.content}
+                          <div
+                            class="text-sm text-gray-800 dark:text-gray-200 mt-1 line-clamp-2 break-words"
+                          >
+                            <EmbeddedEvent
+                              nostrIdentifier={result.id}
+                              nestingLevel={0}
+                            />
+                          </div>
+                        {/if}
                       {/if}
-                    {/if}
-                  </div>
-                </button>
-              {/each}
-            </div>
+                    </div>
+                  </button>
+                {/each}
+              </div>
             </div>
           </div>
         {/if}
 
         {#if tTagResults.length > 0}
           <div class="mt-8">
-            <div class={showSidePanel && searchResultsCollapsed ? "lg:block hidden" : "block"}>
+            <div
+              class={showSidePanel && searchResultsCollapsed
+                ? "lg:block hidden"
+                : "block"}
+            >
               <Heading tag="h2" class="h-leather mb-4">
                 Search Results for t-tag: "{searchTerm ||
-                  dTagValue?.toLowerCase()}" ({tTagResults.length} events)
+                  (searchType === "t" ? searchValue : "")}" ({tTagResults.length}
+                events)
               </Heading>
-            <P class="mb-4 text-sm text-gray-600 dark:text-gray-400">
-              Events that are tagged with the t-tag.
-            </P>
-            <div class="space-y-4">
-              {#each tTagResults as result, index}
-                {@const profileData = (result as any).profileData || parseProfileContent(result)}
-                <button
-                  class="w-full text-left border border-gray-300 dark:border-gray-600 rounded-lg p-4 bg-gray-50 dark:bg-primary-800/50 hover:bg-gray-100 dark:hover:bg-primary-700 focus:bg-gray-100 dark:focus:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-primary-500 transition-colors overflow-hidden"
-                  onclick={() => handleEventFound(result)}
-                >
-                  <div class="flex flex-col gap-1">
-                    <div class="flex items-center gap-2 mb-1">
-                      <span class="font-medium text-gray-800 dark:text-gray-100"
-                        >Tagged Event {index + 1}</span
-                      >
-                      <span class="text-xs text-gray-600 dark:text-gray-400"
-                        >Kind: {result.kind}</span
-                      >
-                      {#if result.pubkey && communityStatus[result.pubkey]}
-                        <div
-                          class="flex-shrink-0 w-4 h-4 bg-yellow-100 dark:bg-yellow-900 rounded-full flex items-center justify-center"
-                          title="Has posted to the community"
+              <P class="mb-4 text-sm text-gray-600 dark:text-gray-400">
+                Events that are tagged with the t-tag.
+              </P>
+              <div class="space-y-4">
+                {#each tTagResults as result, index}
+                  {@const profileData =
+                    (result as any).profileData || parseProfileContent(result)}
+                  <button
+                    class="w-full text-left border border-gray-300 dark:border-gray-600 rounded-lg p-4 bg-gray-50 dark:bg-primary-800/50 hover:bg-gray-100 dark:hover:bg-primary-700 focus:bg-gray-100 dark:focus:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-primary-500 transition-colors overflow-hidden"
+                    onclick={() => handleEventFound(result)}
+                  >
+                    <div class="flex flex-col gap-1">
+                      <div class="flex items-center gap-2 mb-1">
+                        <span
+                          class="font-medium text-gray-800 dark:text-gray-100"
+                          >Tagged Event {index + 1}</span
+                        >
+                        <span class="text-xs text-gray-600 dark:text-gray-400"
+                          >Kind: {result.kind}</span
                         >
-                          <svg
-                            class="w-3 h-3 text-yellow-600 dark:text-yellow-400"
-                            fill="currentColor"
-                            viewBox="0 0 24 24"
+                        {#if result.pubkey && communityStatus[result.pubkey]}
+                          <div
+                            class="flex-shrink-0 w-4 h-4 bg-yellow-100 dark:bg-yellow-900 rounded-full flex items-center justify-center"
+                            title="Has posted to the community"
                           >
-                            <path
-                              d="M12 2l3.09 6.26L22 9.27l-5 4.87 1.18 6.88L12 17.77l-6.18 3.25L7 14.14 2 9.27l6.91-1.01L12 2z"
+                            <svg
+                              class="w-3 h-3 text-yellow-600 dark:text-yellow-400"
+                              fill="currentColor"
+                              viewBox="0 0 24 24"
+                            >
+                              <path
+                                d="M12 2l3.09 6.26L22 9.27l-5 4.87 1.18 6.88L12 17.77l-6.18 3.25L7 14.14 2 9.27l6.91-1.01L12 2z"
+                              />
+                            </svg>
+                          </div>
+                        {:else}
+                          <div class="flex-shrink-0 w-4 h-4"></div>
+                        {/if}
+                        <span class="text-xs text-gray-600 dark:text-gray-400">
+                          {@render userBadge(
+                            toNpub(result.pubkey) as string,
+                            profileData?.display_name || profileData?.name,
+                          )}
+                        </span>
+                        <span
+                          class="text-xs text-gray-500 dark:text-gray-400 ml-auto"
+                        >
+                          {result.created_at
+                            ? new Date(
+                                result.created_at * 1000,
+                              ).toLocaleDateString()
+                            : "Unknown date"}
+                        </span>
+                      </div>
+                      {#if result.kind === 0 && profileData}
+                        <div class="flex items-center gap-3 mb-2">
+                          {#if profileData.picture}
+                            <img
+                              src={profileData.picture}
+                              alt="Profile"
+                              class="w-12 h-12 rounded-full object-cover border border-gray-200 dark:border-gray-600"
+                              onerror={(e) => {
+                                (e.target as HTMLImageElement).style.display =
+                                  "none";
+                              }}
                             />
-                          </svg>
+                          {:else}
+                            <div
+                              class="w-12 h-12 rounded-full bg-gray-300 dark:bg-gray-600 flex items-center justify-center border border-gray-200 dark:border-gray-600"
+                            >
+                              <span
+                                class="text-lg font-medium text-gray-600 dark:text-gray-300"
+                              >
+                                {(
+                                  profileData.display_name ||
+                                  profileData.name ||
+                                  result.pubkey.slice(0, 1)
+                                ).toUpperCase()}
+                              </span>
+                            </div>
+                          {/if}
+                          <div class="flex flex-col min-w-0 flex-1">
+                            {#if profileData.display_name || profileData.name}
+                              <span
+                                class="font-medium text-gray-900 dark:text-gray-100 truncate"
+                              >
+                                {profileData.display_name || profileData.name}
+                              </span>
+                            {/if}
+                            {#if profileData.about}
+                              <span
+                                class="text-sm text-gray-600 dark:text-gray-400 line-clamp-2"
+                              >
+                                {profileData.about}
+                              </span>
+                            {/if}
+                          </div>
                         </div>
                       {:else}
-                        <div class="flex-shrink-0 w-4 h-4"></div>
-                      {/if}
-                      <span class="text-xs text-gray-600 dark:text-gray-400">
-                        {@render userBadge(
-                          toNpub(result.pubkey) as string,
-                          profileData?.display_name || profileData?.name,
-                        )}
-                      </span>
-                      <span
-                        class="text-xs text-gray-500 dark:text-gray-400 ml-auto"
-                      >
-                        {result.created_at
-                          ? new Date(
-                              result.created_at * 1000,
-                            ).toLocaleDateString()
-                          : "Unknown date"}
-                      </span>
-                    </div>
-                    {#if result.kind === 0 && profileData}
-                      <div class="flex items-center gap-3 mb-2">
-                        {#if profileData.picture}
-                          <img
-                            src={profileData.picture}
-                            alt="Profile"
-                            class="w-12 h-12 rounded-full object-cover border border-gray-200 dark:border-gray-600"
-                            onerror={(e) => {
-                              (e.target as HTMLImageElement).style.display = 'none';
-                            }}
-                          />
-                        {:else}
-                          <div class="w-12 h-12 rounded-full bg-gray-300 dark:bg-gray-600 flex items-center justify-center border border-gray-200 dark:border-gray-600">
-                            <span class="text-lg font-medium text-gray-600 dark:text-gray-300">
-                              {(profileData.display_name || profileData.name || result.pubkey.slice(0, 1)).toUpperCase()}
-                            </span>
+                        {#if getSummary(result)}
+                          <div
+                            class="text-sm text-primary-900 dark:text-primary-200 mb-1 line-clamp-2"
+                          >
+                            {getSummary(result)}
                           </div>
                         {/if}
-                        <div class="flex flex-col min-w-0 flex-1">
-                          {#if profileData.display_name || profileData.name}
-                            <span class="font-medium text-gray-900 dark:text-gray-100 truncate">
-                              {profileData.display_name || profileData.name}
-                            </span>
-                          {/if}
-                          {#if profileData.about}
-                            <span class="text-sm text-gray-600 dark:text-gray-400 line-clamp-2">
-                              {profileData.about}
-                            </span>
-                          {/if}
-                        </div>
-                      </div>
-                    {:else}
-                      {#if getSummary(result)}
-                        <div
-                          class="text-sm text-primary-900 dark:text-primary-200 mb-1 line-clamp-2"
-                        >
-                          {getSummary(result)}
-                        </div>
-                      {/if}
-                      {#if getDeferralNaddr(result)}
-                        <div
-                          class="text-xs text-primary-800 dark:text-primary-300 mb-1"
-                        >
-                          Read
-                          <span
-                            class="underline text-primary-700 dark:text-primary-400 hover:text-primary-900 dark:hover:text-primary-200 break-all cursor-pointer"
-                            onclick={(e) => {
-                              e.stopPropagation();
-                              navigateToPublication(
-                                getDeferralNaddr(result) || "",
-                              );
-                            }}
-                            onkeydown={(e) => {
-                              if (e.key === "Enter" || e.key === " ") {
-                                e.preventDefault();
+                        {#if getDeferralNaddr(result)}
+                          <div
+                            class="text-xs text-primary-800 dark:text-primary-300 mb-1"
+                          >
+                            Read
+                            <span
+                              class="underline text-primary-700 dark:text-primary-400 hover:text-primary-900 dark:hover:text-primary-200 break-all cursor-pointer"
+                              onclick={(e) => {
                                 e.stopPropagation();
                                 navigateToPublication(
                                   getDeferralNaddr(result) || "",
                                 );
-                              }
-                            }}
-                            tabindex="0"
-                            role="button"
+                              }}
+                              onkeydown={(e) => {
+                                if (e.key === "Enter" || e.key === " ") {
+                                  e.preventDefault();
+                                  e.stopPropagation();
+                                  navigateToPublication(
+                                    getDeferralNaddr(result) || "",
+                                  );
+                                }
+                              }}
+                              tabindex="0"
+                              role="button"
+                            >
+                              {getDeferralNaddr(result)}
+                            </span>
+                          </div>
+                        {/if}
+                        {#if isAddressableEvent(result)}
+                          <div
+                            class="text-xs text-blue-600 dark:text-blue-400 mb-1"
                           >
-                            {getDeferralNaddr(result)}
-                          </span>
-                        </div>
-                      {/if}
-                      {#if isAddressableEvent(result)}
-                        <div
-                          class="text-xs text-blue-600 dark:text-blue-400 mb-1"
-                        >
-                          <ViewPublicationLink event={result} />
-                        </div>
-                      {/if}
-                      {#if result.content}
-                        <div
-                          class="text-sm text-gray-800 dark:text-gray-200 mt-1 line-clamp-2 break-words"
-                        >
-                          <EmbeddedEvent nostrIdentifier={result.id} nestingLevel={0} />
-                        </div>
+                            <ViewPublicationLink event={result} />
+                          </div>
+                        {/if}
+                        {#if result.content}
+                          <div
+                            class="text-sm text-gray-800 dark:text-gray-200 mt-1 line-clamp-2 break-words"
+                          >
+                            <EmbeddedEvent
+                              nostrIdentifier={result.id}
+                              nestingLevel={0}
+                            />
+                          </div>
+                        {/if}
                       {/if}
-                    {/if}
-                  </div>
-                </button>
-              {/each}
-            </div>
+                    </div>
+                  </button>
+                {/each}
+              </div>
             </div>
           </div>
         {/if}
 
-        {#if !event && searchResults.length === 0 && secondOrderResults.length === 0 && tTagResults.length === 0 && !searchValue && !dTagValue && !searchInProgress}
+        {#if !event && searchResults.length === 0 && secondOrderResults.length === 0 && tTagResults.length === 0 && !searchValue && !searchInProgress}
           <div class="mt-8">
-            <Heading tag="h2" class="h-leather mb-4">Publish Nostr Event</Heading>
+            <Heading tag="h2" class="h-leather mb-4"
+              >Publish Nostr Event</Heading
+            >
             <P class="mb-4">
-              Create and publish new Nostr events to the network. This form supports various event kinds including:
+              Create and publish new Nostr events to the network. This form
+              supports various event kinds including:
             </P>
-            <ul class="mb-6 list-disc list-inside space-y-1 text-sm text-gray-700 dark:text-gray-300">
-              <li><strong>Kind 30040:</strong> Publication indexes that organize AsciiDoc content into structured publications</li>
-              <li><strong>Kind 30041:</strong> Individual section content for publications</li>
-              <li><strong>Other kinds:</strong> Standard Nostr events with custom tags and content</li>
+            <ul
+              class="mb-6 list-disc list-inside space-y-1 text-sm text-gray-700 dark:text-gray-300"
+            >
+              <li>
+                <strong>Kind 30040:</strong> Publication indexes that organize AsciiDoc
+                content into structured publications
+              </li>
+              <li>
+                <strong>Kind 30041:</strong> Individual section content for publications
+              </li>
+              <li>
+                <strong>Other kinds:</strong> Standard Nostr events with custom tags
+                and content
+              </li>
             </ul>
             <EventInput />
           </div>
@@ -1017,9 +1150,13 @@
 
     <!-- Right Panel: Event Details -->
     {#if showSidePanel && event}
-      <div class="w-full lg:flex-1 lg:min-w-0 main-leather flex flex-col space-y-6 overflow-hidden">
+      <div
+        class="w-full lg:flex-1 lg:min-w-0 main-leather flex flex-col space-y-6 overflow-hidden"
+      >
         <div class="flex justify-between items-center min-w-0">
-          <Heading tag="h2" class="h-leather mb-2 break-words">Event Details</Heading>
+          <Heading tag="h2" class="h-leather mb-2 break-words"
+            >Event Details</Heading
+          >
           <button
             class="text-sm text-gray-600 dark:text-gray-400 hover:text-gray-800 dark:hover:text-gray-200 flex-shrink-0"
             onclick={closeSidePanel}
@@ -1059,10 +1196,12 @@
         <div class="min-w-0 overflow-hidden">
           <CommentViewer {event} />
         </div>
-        
+
         {#if user?.signedIn}
           <div class="mt-8 min-w-0 overflow-hidden">
-            <Heading tag="h3" class="h-leather mb-4 break-words">Add Comment</Heading>
+            <Heading tag="h3" class="h-leather mb-4 break-words"
+              >Add Comment</Heading
+            >
             <CommentBox {event} {userRelayPreference} />
           </div>
         {:else}