diff --git a/nostr_dvm/tasks/content_discovery_currently_popular_by_top_zaps.py b/nostr_dvm/tasks/content_discovery_currently_popular_by_top_zaps.py
index b5b0acd..6275f8b 100644
--- a/nostr_dvm/tasks/content_discovery_currently_popular_by_top_zaps.py
+++ b/nostr_dvm/tasks/content_discovery_currently_popular_by_top_zaps.py
@@ -138,7 +138,9 @@ class DicoverContentCurrentlyPopularZaps(DVMTaskInterface):
                                 invoice_amount = parse_amount_from_bolt11_invoice(tag.as_vec()[1])
                                 # print(invoice_amount)
                             if tag.as_vec()[0] == 'preimage':
-                                haspreimage = True  # TODO further check preimage
+                                if len(tag.as_vec()) > 1:
+                                    if tag.as_vec()[1] != "":
+                                        haspreimage = True  # TODO further check preimage
                     if haspreimage:
                         ns.finallist[event.id().to_hex()] = invoice_amount
 
diff --git a/nostr_dvm/tasks/content_discovery_currently_popular_followers.py b/nostr_dvm/tasks/content_discovery_currently_popular_followers.py
index 21f3775..48a18d6 100644
--- a/nostr_dvm/tasks/content_discovery_currently_popular_followers.py
+++ b/nostr_dvm/tasks/content_discovery_currently_popular_followers.py
@@ -204,7 +204,7 @@ class DicoverContentCurrentlyPopularFollowers(DVMTaskInterface):
         lasthour = Timestamp.from_secs(timestamp_hour_ago)
 
         filter1 = Filter().kinds([definitions.EventDefinitions.KIND_NOTE, definitions.EventDefinitions.KIND_REACTION,
-                                  definitions.EventDefinitions.KIND_ZAP]).since(lasthour)  # Notes, reactions, zaps
+                                  definitions.EventDefinitions.KIND_ZAP, definitions.EventDefinitions.KIND_REPOST]).since(lasthour)  # Notes, reactions, zaps
 
         # filter = Filter().author(keys.public_key())
         print("[" + self.dvm_config.NIP89.NAME + "] Syncing notes of the last " + str(
diff --git a/nostr_dvm/tasks/content_discovery_currently_popular_topic.py b/nostr_dvm/tasks/content_discovery_currently_popular_topic.py
index 16aaada..acac34d 100644
--- a/nostr_dvm/tasks/content_discovery_currently_popular_topic.py
+++ b/nostr_dvm/tasks/content_discovery_currently_popular_topic.py
@@ -201,7 +201,8 @@ class DicoverContentCurrentlyPopularbyTopic(DVMTaskInterface):
         since = Timestamp.from_secs(timestamp_since)
 
         filter1 = Filter().kinds([EventDefinitions.KIND_NOTE, EventDefinitions.KIND_REACTION, EventDefinitions.KIND_ZAP,
-                                  EventDefinitions.KIND_LONGFORM]).since(since)  # Notes, reactions, zaps
+                                  definitions.EventDefinitions.KIND_REPOST
+                                  ]).since(since)  # Notes, reactions, zaps
 
         # filter = Filter().author(keys.public_key())
         print("[" + self.dvm_config.NIP89.NAME + "] Syncing notes of the last " + str(