diff --git a/.gitignore b/.gitignore
index 3a2358d..c99fd18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ gen/
 # Ignore gradle files
 .gradle/
 build/
+release/
 
 # Local configuration file (sdk path, etc)
 local.properties
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
deleted file mode 100644
index e7c919c..0000000
--- a/app/release/output-metadata.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "version": 3,
-  "artifactType": {
-    "type": "APK",
-    "kind": "Directory"
-  },
-  "applicationId": "com.pixelized.rplexicon",
-  "variantName": "release",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "attributes": [],
-      "versionCode": 3,
-      "versionName": "0.1.2",
-      "outputFile": "app-release.apk"
-    }
-  ],
-  "elementType": "File"
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/detail/CharacterDetailScreen.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/detail/CharacterDetailScreen.kt
index 01aa1b9..40db692 100644
--- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/detail/CharacterDetailScreen.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/detail/CharacterDetailScreen.kt
@@ -104,37 +104,44 @@ fun CharacterDetailUio.annotated(): AnnotatedCharacterDetailUio {
     val gender = stringResource(id = gender, short = true)
     val race = stringResource(id = race)
 
-    return AnnotatedCharacterDetailUio(
-        name = AnnotatedString(
-            text = name,
-            spanStyles = highlightRegex?.annotatedSpan(
-                input = name,
-                spanStyle = highlight,
-            ) ?: emptyList()
-        ),
-        diminutive = diminutive?.let { highlightRegex?.annotatedString(it, spanStyle = highlight) },
-        gender = AnnotatedString(
-            text = gender,
-            spanStyles = when (highlightGender) {
-                true -> listOf(AnnotatedString.Range(highlight, 0, gender.length))
-                else -> emptyList()
-            }
-        ),
-        race = AnnotatedString(
-            text = race,
-            spanStyles = when (highlightRace) {
-                true -> listOf(AnnotatedString.Range(highlight, 0, race.length))
-                else -> emptyList()
-            }
-        ),
-        description = description?.let { description ->
-            highlightRegex?.annotatedString(description, spanStyle = highlight)
-        },
-        history = history?.let { history ->
-            highlightRegex?.annotatedString(history, spanStyle = highlight)
-        },
-        portrait = portrait,
-    )
+    return remember(search, race, highlightRace, gender, highlightGender) {
+        AnnotatedCharacterDetailUio(
+            name = AnnotatedString(
+                text = name,
+                spanStyles = highlightRegex?.annotatedSpan(
+                    input = name,
+                    spanStyle = highlight,
+                ) ?: emptyList()
+            ),
+            diminutive = diminutive?.let {
+                highlightRegex?.annotatedString(
+                    input = it,
+                    spanStyle = highlight
+                )
+            },
+            gender = AnnotatedString(
+                text = gender,
+                spanStyles = when (highlightGender) {
+                    true -> listOf(AnnotatedString.Range(highlight, 0, gender.length))
+                    else -> emptyList()
+                }
+            ),
+            race = AnnotatedString(
+                text = race,
+                spanStyles = when (highlightRace) {
+                    true -> listOf(AnnotatedString.Range(highlight, 0, race.length))
+                    else -> emptyList()
+                }
+            ),
+            description = description?.let { description ->
+                highlightRegex?.annotatedString(description, spanStyle = highlight)
+            },
+            history = history?.let { history ->
+                highlightRegex?.annotatedString(history, spanStyle = highlight)
+            },
+            portrait = portrait,
+        )
+    }
 }
 
 @Composable
diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/search/SearchItem.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/search/SearchItem.kt
index b976bb7..46e560c 100644
--- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/search/SearchItem.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/search/SearchItem.kt
@@ -104,7 +104,7 @@ private fun SearchItemUio.annotate(): AnnotatedSearchItemUio {
     val gender = stringResource(id = gender, short = true)
     val race = stringResource(id = race)
 
-    return remember(search) {
+    return remember(search, race, highlightRace, gender, highlightGender) {
         AnnotatedSearchItemUio(
             id = id,
             name = AnnotatedString(