diff --git a/data/src/main/java/tachiyomi/data/manga/MangaMapper.kt b/data/src/main/java/tachiyomi/data/manga/MangaMapper.kt
index bbe09c66a..6bfa30101 100644
--- a/data/src/main/java/tachiyomi/data/manga/MangaMapper.kt
+++ b/data/src/main/java/tachiyomi/data/manga/MangaMapper.kt
@@ -86,7 +86,6 @@ object MangaMapper {
         coverLastModified: Long,
         dateAdded: Long,
         // SY -->
-        @Suppress("UNUSED_PARAMETER")
         filteredScanlators: String?,
         // SY <--
         updateStrategy: UpdateStrategy,
@@ -124,7 +123,7 @@ object MangaMapper {
             coverLastModified,
             dateAdded,
             // SY -->
-            null,
+            filteredScanlators,
             // SY <--
             updateStrategy,
             calculateInterval,
@@ -193,7 +192,9 @@ object MangaMapper {
             chapterFlags,
             coverLastModified,
             dateAdded,
+            // SY -->
             filteredScanlators,
+            // SY <--
             updateStrategy,
             calculateInterval,
             lastModifiedAt,
diff --git a/data/src/main/java/tachiyomi/data/source/EHentaiPagingSource.kt b/data/src/main/java/tachiyomi/data/source/EHentaiPagingSource.kt
index 933e504fc..104c4c83f 100644
--- a/data/src/main/java/tachiyomi/data/source/EHentaiPagingSource.kt
+++ b/data/src/main/java/tachiyomi/data/source/EHentaiPagingSource.kt
@@ -8,7 +8,9 @@ import exh.metadata.metadata.RaisedSearchMetadata
 import mihon.domain.manga.model.toDomainManga
 import tachiyomi.domain.manga.model.Manga
 
-abstract class EHentaiPagingSource(override val source: CatalogueSource) : BaseSourcePagingSource(source) {
+abstract class EHentaiPagingSource(
+    override val source: CatalogueSource,
+) : BaseSourcePagingSource(source) {
 
     override suspend fun getPageLoadResult(
         params: LoadParams<Long>,
@@ -18,12 +20,11 @@ abstract class EHentaiPagingSource(override val source: CatalogueSource) : BaseS
         val metadata = mangasPage.mangasMetadata
 
         val manga = mangasPage.mangas
-            .map { it.toDomainManga(source.id) }
-            .filter { seenManga.add(it.url) }
-            /* KMK --> .let { networkToLocalManga(it) } KMK <-- */
-            // SY -->
-            .mapIndexed { index, manga -> manga to metadata.getOrNull(index) }
-        // SY <--
+            .mapIndexed { index, sManga -> sManga.toDomainManga(source.id) to metadata.getOrNull(index) }
+            .filter { seenManga.add(it.first.url) }
+        // KMK -->
+        // .let { pairs -> pairs.zip(networkToLocalManga(pairs.map { it.first })).map { it.second to it.first.second } }
+        // KMK <--
 
         return LoadResult.Page(
             data = manga,
diff --git a/data/src/main/java/tachiyomi/data/source/SourcePagingSource.kt b/data/src/main/java/tachiyomi/data/source/SourcePagingSource.kt
index 13a8c7406..e77d28d57 100644
--- a/data/src/main/java/tachiyomi/data/source/SourcePagingSource.kt
+++ b/data/src/main/java/tachiyomi/data/source/SourcePagingSource.kt
@@ -90,11 +90,12 @@ abstract class BaseSourcePagingSource(
         // SY <--
 
         val manga = mangasPage.mangas
-            .map { it.toDomainManga(source!!.id) }
-            .filter { seenManga.add(it.url) }
-            /* KMK --> .let { networkToLocalManga(it) } KMK <-- */
             // SY -->
-            .mapIndexed { index, manga -> manga to metadata.getOrNull(index) }
+            .mapIndexed { index, sManga -> sManga.toDomainManga(source!!.id) to metadata.getOrNull(index) }
+            .filter { seenManga.add(it.first.url) }
+        // KMK -->
+        // .let { pairs -> pairs.zip(networkToLocalManga(pairs.map { it.first })).map { it.second to it.first.second } }
+        // KMK <--
         // SY <--
 
         return LoadResult.Page(