diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceEHentaiList.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceEHentaiList.kt
index a6c8457d3..81d01ac67 100644
--- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceEHentaiList.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceEHentaiList.kt
@@ -127,11 +127,13 @@ fun BrowseSourceEHentaiListItem(
     val context = LocalContext.current
     val languageText by produceState("", metadata) {
         value = withIOContext {
-            val locale = SourceTagsUtil.getLocaleSourceUtil(
-                metadata.tags
-                    .firstOrNull { it.namespace == EHentaiSearchMetadata.EH_LANGUAGE_NAMESPACE }
-                    ?.name,
-            )
+            // KMK -->
+            val locale = metadata.tags
+                .filter { it.namespace == EHentaiSearchMetadata.EH_LANGUAGE_NAMESPACE }
+                .firstNotNullOfOrNull {
+                    SourceTagsUtil.getLocaleSourceUtil(it.name)
+                }
+            // KMK <--
             val pageCount = metadata.length
             if (locale != null && pageCount != null) {
                 context.pluralStringResource(
diff --git a/i18n-sy/src/commonMain/moko-resources/as/plurals.xml b/i18n-sy/src/commonMain/moko-resources/as/plurals.xml
index b4b6de566..29a4d48be 100644
--- a/i18n-sy/src/commonMain/moko-resources/as/plurals.xml
+++ b/i18n-sy/src/commonMain/moko-resources/as/plurals.xml
@@ -21,8 +21,8 @@
         <item quantity="other">%1$d পৃষ্ঠাসমূহ</item>
     </plurals>
     <plurals name="browse_language_and_pages">
-        <item quantity="one">%2$s, %1$d পৃষ্ঠা</item>
-        <item quantity="other">%2$s, %1$d পৃষ্ঠাসমূহ</item>
+        <item quantity="one">%2$s %1$d পৃষ্ঠা</item>
+        <item quantity="other">%2$s %1$d পৃষ্ঠাসমূহ</item>
     </plurals>
     <plurals name="humanize_year">
         <item quantity="one">%1$d বৰ্ষ পূৰ্বে</item>
diff --git a/i18n-sy/src/commonMain/moko-resources/base/plurals.xml b/i18n-sy/src/commonMain/moko-resources/base/plurals.xml
index 9f2970ac7..c4a31d978 100644
--- a/i18n-sy/src/commonMain/moko-resources/base/plurals.xml
+++ b/i18n-sy/src/commonMain/moko-resources/base/plurals.xml
@@ -38,8 +38,8 @@
 
     <!-- Enhanced E/ExHentai Browse View -->
     <plurals name="browse_language_and_pages">
-        <item quantity="one">%2$s, %1$d page</item>
-        <item quantity="other">%2$s, %1$d pages</item>
+        <item quantity="one">%2$s %1$d page</item>
+        <item quantity="other">%2$s %1$d pages</item>
     </plurals>
 
     <!-- Humanize time -->
diff --git a/i18n-sy/src/commonMain/moko-resources/de/plurals.xml b/i18n-sy/src/commonMain/moko-resources/de/plurals.xml
index 70c3fcdf0..2efa5df88 100644
--- a/i18n-sy/src/commonMain/moko-resources/de/plurals.xml
+++ b/i18n-sy/src/commonMain/moko-resources/de/plurals.xml
@@ -33,8 +33,8 @@
         <item quantity="other">%1$d Seiten</item>
     </plurals>
     <plurals name="browse_language_and_pages">
-        <item quantity="one">%2$s, %1$d Seite</item>
-        <item quantity="other">%2$s, %1$d Seiten</item>
+        <item quantity="one">%2$s %1$d Seite</item>
+        <item quantity="other">%2$s %1$d Seiten</item>
     </plurals>
     <plurals name="humanize_year">
         <item quantity="one">vor %1$d Jahr</item>
diff --git a/i18n-sy/src/commonMain/moko-resources/eo/plurals.xml b/i18n-sy/src/commonMain/moko-resources/eo/plurals.xml
index a884d8901..80d937c93 100644
--- a/i18n-sy/src/commonMain/moko-resources/eo/plurals.xml
+++ b/i18n-sy/src/commonMain/moko-resources/eo/plurals.xml
@@ -33,8 +33,8 @@
         <item quantity="other">antaŭ %1$d tagoj</item>
     </plurals>
     <plurals name="browse_language_and_pages">
-        <item quantity="one">%2$s, %1$d paĝo</item>
-        <item quantity="other">%2$s, %1$d paĝoj</item>
+        <item quantity="one">%2$s %1$d paĝo</item>
+        <item quantity="other">%2$s %1$d paĝoj</item>
     </plurals>
     <plurals name="num_pages">
         <item quantity="one">%1$d paĝo</item>
diff --git a/i18n-sy/src/commonMain/moko-resources/es/plurals.xml b/i18n-sy/src/commonMain/moko-resources/es/plurals.xml
index ec27172c3..22afcaa9e 100644
--- a/i18n-sy/src/commonMain/moko-resources/es/plurals.xml
+++ b/i18n-sy/src/commonMain/moko-resources/es/plurals.xml
@@ -36,9 +36,9 @@
         <item quantity="other">%1$d páginas</item>
     </plurals>
     <plurals name="browse_language_and_pages">
-        <item quantity="one">%2$s, %1$d página</item>
-        <item quantity="many">%2$s, %1$d páginas</item>
-        <item quantity="other">%2$s, %1$d páginas</item>
+        <item quantity="one">%2$s %1$d página</item>
+        <item quantity="many">%2$s %1$d páginas</item>
+        <item quantity="other">%2$s %1$d páginas</item>
     </plurals>
     <plurals name="humanize_year">
         <item quantity="one">hace %1$d año</item>
diff --git a/i18n-sy/src/commonMain/moko-resources/fil/plurals.xml b/i18n-sy/src/commonMain/moko-resources/fil/plurals.xml
index 5295fa8fc..9d12cd232 100644
--- a/i18n-sy/src/commonMain/moko-resources/fil/plurals.xml
+++ b/i18n-sy/src/commonMain/moko-resources/fil/plurals.xml
@@ -41,8 +41,8 @@
         <item quantity="other">%1$d na mga pahina</item>
     </plurals>
     <plurals name="browse_language_and_pages">
-        <item quantity="one">%2$s, %1$d na pahina</item>
-        <item quantity="other">%2$s, %1$d na mga pahina</item>
+        <item quantity="one">%2$s %1$d na pahina</item>
+        <item quantity="other">%2$s %1$d na mga pahina</item>
     </plurals>
     <plurals name="humanize_year">
         <item quantity="one">%1$d taon ang nakalipas</item>
diff --git a/i18n-sy/src/commonMain/moko-resources/fr/plurals.xml b/i18n-sy/src/commonMain/moko-resources/fr/plurals.xml
index 21336a11d..fba8b206a 100644
--- a/i18n-sy/src/commonMain/moko-resources/fr/plurals.xml
+++ b/i18n-sy/src/commonMain/moko-resources/fr/plurals.xml
@@ -38,9 +38,9 @@
     </plurals>
     <!-- Enhanced E/ExHentai Browse View -->
     <plurals name="browse_language_and_pages">
-        <item quantity="one">%2$s, %1$d page</item>
-        <item quantity="many">%2$s, %1$d pages</item>
-        <item quantity="other">%2$s, %1$d pages</item>
+        <item quantity="one">%2$s %1$d page</item>
+        <item quantity="many">%2$s %1$d pages</item>
+        <item quantity="other">%2$s %1$d pages</item>
     </plurals>
     <!-- Humanize time -->
     <plurals name="humanize_year">
diff --git a/i18n-sy/src/commonMain/moko-resources/hr/plurals.xml b/i18n-sy/src/commonMain/moko-resources/hr/plurals.xml
index 80d8695d0..70370a1e1 100644
--- a/i18n-sy/src/commonMain/moko-resources/hr/plurals.xml
+++ b/i18n-sy/src/commonMain/moko-resources/hr/plurals.xml
@@ -6,9 +6,9 @@
         <item quantity="other">%1$d stranica</item>
     </plurals>
     <plurals name="browse_language_and_pages">
-        <item quantity="one">%2$s, %1$d stranica</item>
-        <item quantity="few">%2$s, %1$d stranice</item>
-        <item quantity="other">%2$s, %1$d stranica</item>
+        <item quantity="one">%2$s %1$d stranica</item>
+        <item quantity="few">%2$s %1$d stranice</item>
+        <item quantity="other">%2$s %1$d stranica</item>
     </plurals>
     <plurals name="cleanup_done">
         <item quantity="one">Čišćenje je gotovo. Uklonjena je %d mapa</item>
diff --git a/i18n-sy/src/commonMain/moko-resources/in/plurals.xml b/i18n-sy/src/commonMain/moko-resources/in/plurals.xml
index f1577916b..8925b760c 100644
--- a/i18n-sy/src/commonMain/moko-resources/in/plurals.xml
+++ b/i18n-sy/src/commonMain/moko-resources/in/plurals.xml
@@ -37,8 +37,8 @@
     </plurals>
     <!-- Enhanced E/ExHentai Browse View -->
     <plurals name="browse_language_and_pages">
-        <item quantity="one">%2$s, %1$d page</item>
-        <item quantity="other">%2$s, %1$d pages</item>
+        <item quantity="one">%2$s %1$d page</item>
+        <item quantity="other">%2$s %1$d pages</item>
     </plurals>
     <!-- Humanize time -->
     <plurals name="humanize_year">
diff --git a/i18n-sy/src/commonMain/moko-resources/ja/plurals.xml b/i18n-sy/src/commonMain/moko-resources/ja/plurals.xml
index 9388bb7ac..14ce884b4 100644
--- a/i18n-sy/src/commonMain/moko-resources/ja/plurals.xml
+++ b/i18n-sy/src/commonMain/moko-resources/ja/plurals.xml
@@ -33,8 +33,8 @@
     </plurals>
     <!-- Enhanced E/ExHentai Browse View -->
     <plurals name="browse_language_and_pages">
-        <item quantity="one">%2$s, %1$d ページ</item>
-        <item quantity="other">%2$s, %1$d ページ</item>
+        <item quantity="one">%2$s %1$d ページ</item>
+        <item quantity="other">%2$s %1$d ページ</item>
     </plurals>
     <!-- Humanize time -->
     <plurals name="humanize_year">
diff --git a/i18n-sy/src/commonMain/moko-resources/pt-rBR/plurals.xml b/i18n-sy/src/commonMain/moko-resources/pt-rBR/plurals.xml
index ea93298ef..0eca8d4ea 100644
--- a/i18n-sy/src/commonMain/moko-resources/pt-rBR/plurals.xml
+++ b/i18n-sy/src/commonMain/moko-resources/pt-rBR/plurals.xml
@@ -35,8 +35,8 @@
 
     <!-- Enhanced E/ExHentai Browse View -->
     <plurals name="browse_language_and_pages">
-        <item quantity="one">%2$s, %1$d página</item>
-        <item quantity="other">%2$s, %1$d páginas</item>
+        <item quantity="one">%2$s %1$d página</item>
+        <item quantity="other">%2$s %1$d páginas</item>
     </plurals>
 
     <!-- Humanize time -->
diff --git a/i18n-sy/src/commonMain/moko-resources/ru/plurals.xml b/i18n-sy/src/commonMain/moko-resources/ru/plurals.xml
index e9686317f..063aa823b 100644
--- a/i18n-sy/src/commonMain/moko-resources/ru/plurals.xml
+++ b/i18n-sy/src/commonMain/moko-resources/ru/plurals.xml
@@ -51,10 +51,10 @@
     </plurals>
     <!-- Enhanced E/ExHentai Browse View -->
     <plurals name="browse_language_and_pages">
-        <item quantity="one">%2$s, %1$d страница</item>
-        <item quantity="few">%2$s, %1$d страницы</item>
-        <item quantity="many">%2$s, %1$d страниц</item>
-        <item quantity="other">%2$s, %1$d страниц</item>
+        <item quantity="one">%2$s %1$d страница</item>
+        <item quantity="few">%2$s %1$d страницы</item>
+        <item quantity="many">%2$s %1$d страниц</item>
+        <item quantity="other">%2$s %1$d страниц</item>
     </plurals>
     <!-- Humanize time -->
     <plurals name="humanize_year">
diff --git a/i18n-sy/src/commonMain/moko-resources/ta/plurals.xml b/i18n-sy/src/commonMain/moko-resources/ta/plurals.xml
index 3655d7669..98086a6a6 100644
--- a/i18n-sy/src/commonMain/moko-resources/ta/plurals.xml
+++ b/i18n-sy/src/commonMain/moko-resources/ta/plurals.xml
@@ -33,8 +33,8 @@
         <item quantity="other">%1$d பக்கங்கள்</item>
     </plurals>
     <plurals name="browse_language_and_pages">
-        <item quantity="one">%2$s, %1$d பக்கம்</item>
-        <item quantity="other">%2$s, %1$d பக்கங்கள்</item>
+        <item quantity="one">%2$s %1$d பக்கம்</item>
+        <item quantity="other">%2$s %1$d பக்கங்கள்</item>
     </plurals>
     <plurals name="humanize_year">
         <item quantity="one">%1$d ஆண்டுக்கு முன்பு</item>
diff --git a/i18n-sy/src/commonMain/moko-resources/zh-rCN/plurals.xml b/i18n-sy/src/commonMain/moko-resources/zh-rCN/plurals.xml
index 327b7740a..79d5c03b0 100644
--- a/i18n-sy/src/commonMain/moko-resources/zh-rCN/plurals.xml
+++ b/i18n-sy/src/commonMain/moko-resources/zh-rCN/plurals.xml
@@ -30,7 +30,7 @@
 
     <!-- Enhanced E/ExHentai Browse View -->
     <plurals name="browse_language_and_pages">
-        <item quantity="other">%2$s, %1$d 页</item>
+        <item quantity="other">%2$s %1$d 页</item>
     </plurals>
 
     <!-- Humanize time -->
diff --git a/i18n-sy/src/commonMain/moko-resources/zh-rTW/plurals.xml b/i18n-sy/src/commonMain/moko-resources/zh-rTW/plurals.xml
index e8bcf122b..72473168a 100644
--- a/i18n-sy/src/commonMain/moko-resources/zh-rTW/plurals.xml
+++ b/i18n-sy/src/commonMain/moko-resources/zh-rTW/plurals.xml
@@ -27,7 +27,7 @@
     </plurals>
     <!-- Enhanced E/ExHentai Browse View -->
     <plurals name="browse_language_and_pages">
-        <item quantity="other">%2$s, %1$d 頁</item>
+        <item quantity="other">%2$s %1$d 頁</item>
     </plurals>
     <!-- Humanize time -->
     <plurals name="humanize_year">