diff --git a/src/all/comickfun/build.gradle b/src/all/comickfun/build.gradle
index ff8011a67..64019663e 100644
--- a/src/all/comickfun/build.gradle
+++ b/src/all/comickfun/build.gradle
@@ -6,7 +6,7 @@ ext {
     extName = 'Comick'
     pkgNameSuffix = 'all.comickfun'
     extClass = '.ComickFunFactory'
-    extVersionCode = 27
+    extVersionCode = 28
     isNsfw = true
 }
 
diff --git a/src/all/comickfun/src/eu/kanade/tachiyomi/extension/all/comickfun/ComickFun.kt b/src/all/comickfun/src/eu/kanade/tachiyomi/extension/all/comickfun/ComickFun.kt
index 4ec7a6ea2..c8dd7ad5f 100644
--- a/src/all/comickfun/src/eu/kanade/tachiyomi/extension/all/comickfun/ComickFun.kt
+++ b/src/all/comickfun/src/eu/kanade/tachiyomi/extension/all/comickfun/ComickFun.kt
@@ -293,9 +293,7 @@ abstract class ComickFun(
     protected open val defaultPopularSort: Int = 0
     protected open val defaultLatestSort: Int = 4
 
-    override fun getFilterList() = FilterList(
-        getFilters(),
-    )
+    override fun getFilterList() = getFilters()
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
         ListPreference(screen.context).apply {
diff --git a/src/all/comickfun/src/eu/kanade/tachiyomi/extension/all/comickfun/ComickFunFilters.kt b/src/all/comickfun/src/eu/kanade/tachiyomi/extension/all/comickfun/ComickFunFilters.kt
index 1db8d7068..cf70ed194 100644
--- a/src/all/comickfun/src/eu/kanade/tachiyomi/extension/all/comickfun/ComickFunFilters.kt
+++ b/src/all/comickfun/src/eu/kanade/tachiyomi/extension/all/comickfun/ComickFunFilters.kt
@@ -3,7 +3,7 @@ package eu.kanade.tachiyomi.extension.all.comickfun
 import eu.kanade.tachiyomi.source.model.Filter
 import eu.kanade.tachiyomi.source.model.FilterList
 
-internal fun getFilters(): FilterList {
+fun getFilters(): FilterList {
     return FilterList(
         Filter.Header(name = "NOTE: Everything below is ignored if using text search"),
         CompletedFilter("Completed translation"),
diff --git a/src/en/allanime/build.gradle b/src/en/allanime/build.gradle
index d1b088eb4..ff7f3a4cc 100644
--- a/src/en/allanime/build.gradle
+++ b/src/en/allanime/build.gradle
@@ -6,7 +6,7 @@ ext {
     extName = 'AllAnime'
     pkgNameSuffix = 'en.allanime'
     extClass = '.AllAnime'
-    extVersionCode = 3
+    extVersionCode = 4
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/allanime/src/eu/kanade/tachiyomi/extension/en/allanime/AllAnime.kt b/src/en/allanime/src/eu/kanade/tachiyomi/extension/en/allanime/AllAnime.kt
index c06765307..6b111c979 100644
--- a/src/en/allanime/src/eu/kanade/tachiyomi/extension/en/allanime/AllAnime.kt
+++ b/src/en/allanime/src/eu/kanade/tachiyomi/extension/en/allanime/AllAnime.kt
@@ -145,7 +145,7 @@ class AllAnime : ConfigurableSource, HttpSource() {
         return MangasPage(mangaList, mangaList.size == limit)
     }
 
-    override fun getFilterList() = filters
+    override fun getFilterList() = getFilters()
 
     /* Details */
     override fun mangaDetailsRequest(manga: SManga): Request {
@@ -271,17 +271,17 @@ class AllAnime : ConfigurableSource, HttpSource() {
                     ?.groupValues
                     ?.getOrNull(1)
                     ?.replace("\\u002F", "/")
-                    ?.substringBeforeLast(pages.pictureUrls.first().toString(), "")
+                    ?.substringBeforeLast(pages.pictureUrls?.first().toString(), "")
             }
             url?.takeIf { it.isNotEmpty() } ?: return emptyList()
         }
 
-        return pages.pictureUrls.mapIndexed { index, image ->
+        return pages.pictureUrls?.mapIndexed { index, image ->
             Page(
                 index = index,
                 imageUrl = "$imageDomain${image.url}#page",
             )
-        }
+        } ?: emptyList()
     }
 
     override fun pageListParse(response: Response): List<Page> {
diff --git a/src/en/allanime/src/eu/kanade/tachiyomi/extension/en/allanime/AllAnimeDto.kt b/src/en/allanime/src/eu/kanade/tachiyomi/extension/en/allanime/AllAnimeDto.kt
index ab1c60a79..d60d22919 100644
--- a/src/en/allanime/src/eu/kanade/tachiyomi/extension/en/allanime/AllAnimeDto.kt
+++ b/src/en/allanime/src/eu/kanade/tachiyomi/extension/en/allanime/AllAnimeDto.kt
@@ -157,7 +157,7 @@ data class ApiPageListResponse(
             @Serializable
             data class Servers(
                 @SerialName("pictureUrlHead") val serverUrl: String? = null,
-                val pictureUrls: List<PageUrl>,
+                val pictureUrls: List<PageUrl>?,
             ) {
                 @Serializable
                 data class PageUrl(
diff --git a/src/en/allanime/src/eu/kanade/tachiyomi/extension/en/allanime/AllAnimeFiters.kt b/src/en/allanime/src/eu/kanade/tachiyomi/extension/en/allanime/AllAnimeFiters.kt
index 603ce7ac3..60b0eeef0 100644
--- a/src/en/allanime/src/eu/kanade/tachiyomi/extension/en/allanime/AllAnimeFiters.kt
+++ b/src/en/allanime/src/eu/kanade/tachiyomi/extension/en/allanime/AllAnimeFiters.kt
@@ -97,7 +97,7 @@ private val countryList: List<Pair<String, String>> = listOf(
     Pair("Korea", "KR"),
 )
 
-val filters = FilterList(
+fun getFilters() = FilterList(
     CountryFilter("Countries", countryList),
     GenreFilter("Genres", genreList),
 )
diff --git a/src/en/rmanga/build.gradle b/src/en/rmanga/build.gradle
index f06250373..6e3a110aa 100644
--- a/src/en/rmanga/build.gradle
+++ b/src/en/rmanga/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'Rmanga.app'
     pkgNameSuffix = 'en.rmanga'
     extClass = '.Rmanga'
-    extVersionCode = 1
+    extVersionCode = 2
 }
 
 apply from: "$rootDir/common.gradle"
\ No newline at end of file
diff --git a/src/en/rmanga/src/eu/kanade/tachiyomi/extension/en/rmanga/Rmanga.kt b/src/en/rmanga/src/eu/kanade/tachiyomi/extension/en/rmanga/Rmanga.kt
index f5df6721b..e66044ebc 100644
--- a/src/en/rmanga/src/eu/kanade/tachiyomi/extension/en/rmanga/Rmanga.kt
+++ b/src/en/rmanga/src/eu/kanade/tachiyomi/extension/en/rmanga/Rmanga.kt
@@ -119,7 +119,7 @@ class Rmanga : ConfigurableSource, ParsedHttpSource() {
         return POST("$baseUrl/detailed-search", headers, payload)
     }
 
-    override fun getFilterList() = filters
+    override fun getFilterList() = getFilters()
 
     override fun searchMangaFromElement(element: Element) = popularMangaFromElement(element)
 
diff --git a/src/en/rmanga/src/eu/kanade/tachiyomi/extension/en/rmanga/RmangaFilters.kt b/src/en/rmanga/src/eu/kanade/tachiyomi/extension/en/rmanga/RmangaFilters.kt
index 0bbd59d2d..7511f17bf 100644
--- a/src/en/rmanga/src/eu/kanade/tachiyomi/extension/en/rmanga/RmangaFilters.kt
+++ b/src/en/rmanga/src/eu/kanade/tachiyomi/extension/en/rmanga/RmangaFilters.kt
@@ -8,7 +8,7 @@ class Genre(
     val id: String,
 ) : Filter.TriState(name)
 
-internal class GenreFilter(name: String, private val genres: List<Genre>) :
+internal class GenreFilter(name: String, genres: List<Genre>) :
     Filter.Group<Genre>(name, genres)
 
 private val genreList = listOf(
@@ -86,7 +86,7 @@ private val statusFilter: Array<String> = arrayOf(
     "Completed",
 )
 
-val filters = FilterList(
+fun getFilters() = FilterList(
     TypeFilter("Type", typeFilter),
     AuthorFilter("Author"),
     ArtistFilter("Artist"),