diff --git a/src/lib/components/util/CardActions.svelte b/src/lib/components/util/CardActions.svelte
index f7cc569..9422c41 100644
--- a/src/lib/components/util/CardActions.svelte
+++ b/src/lib/components/util/CardActions.svelte
@@ -82,7 +82,9 @@
    */
   function getIdentifier(type: 'nevent' | 'naddr'): string {
     const encodeFn = type === 'nevent' ? neventEncode : naddrEncode;
-    return encodeFn(event, activeRelays);
+    const identifier = encodeFn(event, activeRelays);
+    console.debug(`[CardActions] ${type} identifier for event ${event.id}:`, identifier);
+    return identifier;
   }
 
   /**
@@ -201,7 +203,7 @@
         <h5 class="text-sm">Identifier: {identifier}</h5>
       {/if}
       <a 
-        href="/events?id={neventEncode(event, activeRelays)}" 
+        href="/events?id={getIdentifier('nevent')}" 
         class="mt-4 btn-leather text-center text-primary-700 hover:text-primary-800 dark:text-primary-400 dark:hover:text-primary-300 font-semibold"
       >
         View Event Details
diff --git a/src/routes/events/+page.svelte b/src/routes/events/+page.svelte
index 077d83f..4b7b373 100644
--- a/src/routes/events/+page.svelte
+++ b/src/routes/events/+page.svelte
@@ -89,9 +89,6 @@
         error = 'Event not found';
       } else {
         console.log('[Events] Event found:', event);
-        if (typeof event.getMatchingTags !== 'function') {
-          event = new NDKEvent(event.ndk || $ndkInstance, event);
-        }
       }
     } catch (err) {
       console.error('[Events] Error fetching event:', err, 'Query:', searchQuery);