diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt
index fa8bb7b82..34868d7e4 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt
@@ -718,7 +718,7 @@ class FollowListViewModel(
                 if (
                     event != null &&
                     event.pubKey == account.userProfile().pubkeyHex &&
-                    (event.tags.size > 1 || event.content.length > 50)
+                    (event.hasAnyTaggedUser() || event.publicAndPrivateUserCache?.isNotEmpty() == true)
                 ) {
                     CodeName(event.address().toTag(), PeopleListName(addressableNote), CodeNameType.PEOPLE_LIST)
                 } else {
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/GeneralListEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/GeneralListEvent.kt
index dfa32eb79..6256e7eca 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/events/GeneralListEvent.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/events/GeneralListEvent.kt
@@ -54,7 +54,7 @@ abstract class GeneralListEvent(
 
     fun title() = tags.firstOrNull { it.size > 1 && it[0] == "title" }?.get(1)
 
-    fun nameOrTitle() = name() ?: title()
+    fun nameOrTitle() = name()?.ifBlank { null } ?: title()?.ifBlank { null }
 
     fun cachedPrivateTags(): Array<Array<String>>? = privateTagsCache