diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Highlight.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Highlight.kt
index 4f0e833b5..1f4a0955f 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Highlight.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Highlight.kt
@@ -78,7 +78,7 @@ fun RenderHighlight(
         comment = noteEvent.comment(),
         highlight = noteEvent.quote(),
         context = noteEvent.context(),
-        authorHex = noteEvent.pubKey,
+        authorHex = noteEvent.author(),
         url = noteEvent.inUrl(),
         postAddress = noteEvent.inPostAddress(),
         postVersion = noteEvent.inPostVersion(),
@@ -124,7 +124,7 @@ fun DisplayHighlight(
     }
 
     val quote =
-        remember {
+        remember(highlight) {
             highlight.split("\n").joinToString("\n") { "> *${it.removeSuffix(" ")}*" }
         }
 
diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip84Highlights/HighlightEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip84Highlights/HighlightEvent.kt
index d6c198a64..5abc44d6e 100644
--- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip84Highlights/HighlightEvent.kt
+++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip84Highlights/HighlightEvent.kt
@@ -35,7 +35,7 @@ import com.vitorpamplona.quartz.nip01Core.tags.aTag.firstTaggedAddress
 import com.vitorpamplona.quartz.nip01Core.tags.events.ETag
 import com.vitorpamplona.quartz.nip01Core.tags.events.firstTaggedEvent
 import com.vitorpamplona.quartz.nip01Core.tags.people.PTag
-import com.vitorpamplona.quartz.nip01Core.tags.people.firstTaggedUser
+import com.vitorpamplona.quartz.nip01Core.tags.people.firstTaggedUserId
 import com.vitorpamplona.quartz.nip01Core.tags.references.ReferenceTag
 import com.vitorpamplona.quartz.nip10Notes.BaseThreadedEvent
 import com.vitorpamplona.quartz.nip18Reposts.quotes.QTag
@@ -116,7 +116,7 @@ class HighlightEvent(
 
     fun inUrl() = tags.firstNotNullOfOrNull(ReferenceTag::parse)
 
-    fun author() = firstTaggedUser()
+    fun author() = firstTaggedUserId()
 
     fun quote() = content