diff --git a/src/components/Recipe/TotalComments.svelte b/src/components/Recipe/TotalComments.svelte
index 4179889..686f6a2 100644
--- a/src/components/Recipe/TotalComments.svelte
+++ b/src/components/Recipe/TotalComments.svelte
@@ -1,26 +1,25 @@
 <script lang="ts">
   import { ndk } from '$lib/nostr';
   import type { NDKEvent } from '@nostr-dev-kit/ndk';
-  import { onMount } from 'svelte';
   import CommentIcon from 'phosphor-svelte/lib/ChatTeardropText';
 
   export let event: NDKEvent;
   let loading = true;
-  let totalLikeAmount: number = 0;
+  let totalCommentAmount: number = 0;
 
-  onMount(async () => {
-    const evs = await $ndk.fetchEvents({
-      kinds: [1],
-      '#a': [`${event.kind}:${event.author.hexpubkey}:${event.tags.find((e) => e[0] == 'd')?.[1]}`]
-    });
-    evs.forEach(() => {
-      totalLikeAmount = totalLikeAmount + 1;
-    });
-  });
+  $: {
+    (async () => {
+      const evs = await $ndk.fetchEvents({
+        kinds: [1],
+        '#a': [`${event.kind}:${event.author.hexpubkey}:${event.tags.find((e) => e[0] == 'd')?.[1]}`]
+      });
+      totalCommentAmount = evs.size // normal way
+    })()
+  }
   loading = false;
 </script>
 
 <a href="#comments" class="flex gap-1.5">
   <CommentIcon size={24} />
-  {#if loading}...{:else}{totalLikeAmount}{/if}
+  {#if loading}...{:else}{totalCommentAmount}{/if}
 </a>
diff --git a/src/components/Recipe/TotalLikes.svelte b/src/components/Recipe/TotalLikes.svelte
index 9a19fa5..7719f86 100644
--- a/src/components/Recipe/TotalLikes.svelte
+++ b/src/components/Recipe/TotalLikes.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { ndk, userPublickey } from '$lib/nostr';
   import type { NDKEvent } from '@nostr-dev-kit/ndk';
-  import { onMount } from 'svelte';
   import HeartIcon from 'phosphor-svelte/lib/Heart';
 
   export let event: NDKEvent;
@@ -9,20 +8,16 @@
   let totalLikeAmount: number = 0;
   let liked = false;
 
-  onMount(async () => {
-    const evs = await $ndk.fetchEvents({
-      kinds: [7],
-      '#a': [`${event.kind}:${event.author.hexpubkey}:${event.tags.find((e) => e[0] == 'd')?.[1]}`]
-    });
-    evs.forEach((a) => {
-      if (a.content == '+') {
-        totalLikeAmount = totalLikeAmount + 1;
-        if (a.pubkey == $userPublickey) {
-          liked = true;
-        }
-      }
-    });
-  });
+  $: {
+    (async () => {
+      const evs = await $ndk.fetchEvents({
+        kinds: [7],
+        '#a': [`${event.kind}:${event.author.hexpubkey}:${event.tags.find((e) => e[0] == 'd')?.[1]}`]
+      });
+      if (Array.from(evs).find((e) => e.pubkey == $userPublickey)) liked = true;
+      totalLikeAmount = evs.size;
+    })()
+  }
   loading = false;
   async function likePost() {
     if (liked) return;
diff --git a/src/components/Recipe/TotalZaps.svelte b/src/components/Recipe/TotalZaps.svelte
index f6fb91a..3afb9b4 100644
--- a/src/components/Recipe/TotalZaps.svelte
+++ b/src/components/Recipe/TotalZaps.svelte
@@ -10,15 +10,13 @@
   let loading = true;
   let totalZapAmount: number = 0;
   let didSigs = new Map();
-  let zapped = false;
 
   async function fetch() {
     const evs = await $ndk.fetchEvents({
       kinds: [9735],
-      '#a': [`${event.kind}:${event.author.hexpubkey}:${event.tags.find((e) => e[0] == 'd')?.[1]}`]
+      '#a': [`${event.kind}:${event.author.pubkey}:${event.tags.find((e) => e[0] == 'd')?.[1]}`]
     });
     evs.forEach((a) => {
-      if (a.pubkey == $userPublickey) zapped = true;
       let bolt11 = a.tags.find((e) => e[0] == 'bolt11')?.[1];
       if (bolt11 && a.sig) {
         if (!didSigs.has(a.sig)) {