diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/geohashLists/GeohashListState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/geohashLists/GeohashListState.kt
index fef8ba33b..dc7eaa534 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/geohashLists/GeohashListState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/geohashLists/GeohashListState.kt
@@ -58,7 +58,7 @@ class GeohashListState(
 
     suspend fun geohashListWithBackup(note: Note): Set<String> {
         val event = note.event as? GeohashListEvent ?: settings.backupGeohashList
-        return event?.let { decryptionCache.geohashes(it) } ?: emptySet()
+        return event?.let { decryptionCache.geohashes(it).mapTo(mutableSetOf()) { it.lowercase() } } ?: emptySet()
     }
 
     @OptIn(ExperimentalCoroutinesApi::class)
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/hashtagLists/HashtagListState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/hashtagLists/HashtagListState.kt
index ae9d90f0d..dd05892a4 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/hashtagLists/HashtagListState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/hashtagLists/HashtagListState.kt
@@ -58,7 +58,7 @@ class HashtagListState(
 
     suspend fun hashtagListWithBackup(note: Note): Set<String> {
         val event = note.event as? HashtagListEvent ?: settings.backupHashtagList
-        return event?.let { decryptionCache.hashtags(it) } ?: emptySet()
+        return event?.let { decryptionCache.hashtags(it).mapTo(mutableSetOf()) { it.lowercase() } } ?: emptySet()
     }
 
     @OptIn(ExperimentalCoroutinesApi::class)
@@ -71,7 +71,7 @@ class HashtagListState(
             }.flowOn(Dispatchers.IO)
             .stateIn(
                 scope,
-                SharingStarted.Companion.Eagerly,
+                SharingStarted.Eagerly,
                 emptySet(),
             )
 
@@ -79,9 +79,9 @@ class HashtagListState(
         val hashtagList = getHashtagList()
 
         return if (hashtagList == null) {
-            HashtagListEvent.Companion.create(hashtags, true, signer)
+            HashtagListEvent.create(hashtags, true, signer)
         } else {
-            HashtagListEvent.Companion.add(hashtagList, hashtags, true, signer)
+            HashtagListEvent.add(hashtagList, hashtags, true, signer)
         }
     }
 
@@ -89,9 +89,9 @@ class HashtagListState(
         val hashtagList = getHashtagList()
 
         return if (hashtagList == null) {
-            HashtagListEvent.Companion.create(hashtag, true, signer)
+            HashtagListEvent.create(hashtag, true, signer)
         } else {
-            HashtagListEvent.Companion.add(hashtagList, hashtag, true, signer)
+            HashtagListEvent.add(hashtagList, hashtag, true, signer)
         }
     }
 
@@ -99,7 +99,7 @@ class HashtagListState(
         val hashtagList = getHashtagList()
 
         return if (hashtagList != null) {
-            HashtagListEvent.Companion.remove(hashtagList, hashtag, signer)
+            HashtagListEvent.remove(hashtagList, hashtag, signer)
         } else {
             null
         }