diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrSearchEventOrUserDataSource.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrSearchEventOrUserDataSource.kt
index 476549aaa..8bf119a38 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrSearchEventOrUserDataSource.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrSearchEventOrUserDataSource.kt
@@ -2,10 +2,13 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.decodePublicKey
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
 import nostr.postr.bechToBytes
+import nostr.postr.events.MetadataEvent
+import nostr.postr.events.TextNoteEvent
 import nostr.postr.toHex
 
 object NostrSearchEventOrUserDataSource: NostrDataSource<Note>("SingleEventFeed") {
@@ -21,13 +24,16 @@ object NostrSearchEventOrUserDataSource: NostrDataSource<Note>("SingleEventFeed"
       TypedFilter(
         types = FeedType.values().toSet(),
         filter = JsonFilter(
-        ids = listOfNotNull(hexToWatch)
-      )),
+          ids = listOfNotNull(hexToWatch)
+        )
+      ),
       TypedFilter(
         types = FeedType.values().toSet(),
         filter = JsonFilter(
-        authors = listOfNotNull(hexToWatch)
-      ))
+          kinds = listOf(MetadataEvent.kind),
+          authors = listOfNotNull(hexToWatch)
+        )
+      )
     )
   }