diff --git a/app/src/main/java/exh/metadata/MetadataUtil.kt b/app/src/main/java/exh/metadata/MetadataUtil.kt
index e8ecb78b4..e775e445c 100755
--- a/app/src/main/java/exh/metadata/MetadataUtil.kt
+++ b/app/src/main/java/exh/metadata/MetadataUtil.kt
@@ -100,11 +100,9 @@ object MetadataUtil {
         "webtoon" -> SourceTagsUtil.GenreColor.NON_H_COLOR to R.string.webtoon
         "Video" -> SourceTagsUtil.GenreColor.WESTERN_COLOR to R.string.video
         else -> null
-    }?.let { it.first.color to context.getString(it.second) }
-}
-
-fun <K, V> Set<Map.Entry<K, V>>.forEach(action: (K, V) -> Unit) {
-    forEach { action(it.key, it.value) }
+    }?.let { (genreColor, stringId) ->
+        genreColor.color to context.getString(stringId)
+    }
 }
 
 fun TextView.bindDrawable(context: Context, @DrawableRes drawable: Int) {
diff --git a/app/src/main/java/exh/metadata/metadata/base/RaisedSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/base/RaisedSearchMetadata.kt
index 436350c83..894f9b728 100644
--- a/app/src/main/java/exh/metadata/metadata/base/RaisedSearchMetadata.kt
+++ b/app/src/main/java/exh/metadata/metadata/base/RaisedSearchMetadata.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.model.toMangaInfo
 import eu.kanade.tachiyomi.source.model.toSManga
-import exh.metadata.forEach
 import exh.metadata.metadata.EHentaiSearchMetadata
 import exh.metadata.metadata.EightMusesSearchMetadata
 import exh.metadata.metadata.HBrowseSearchMetadata
@@ -73,7 +72,7 @@ abstract class RaisedSearchMetadata {
                 it.namespace
             }.entries
 
-            groupedTags.forEach { namespace, tags ->
+            groupedTags.forEach { (namespace, tags) ->
                 if (tags.isNotEmpty()) {
                     val joinedTags = tags.joinToString(separator = " ", transform = { "<${it.name}>" })
                     if (namespace != null) {