diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/id/Kumapage.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/id/Kumapage.kt
index 3acffa8d..aad99744 100644
--- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/id/Kumapage.kt
+++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/id/Kumapage.kt
@@ -12,6 +12,8 @@ import org.koitharu.kotatsu.parsers.util.*
 import java.text.SimpleDateFormat
 import java.util.*
 
+// TODO: Check if manga is NSFW by checking the genre
+
 @MangaSourceParser("KUMAPAGE", "Kumapage", "id")
 internal class Kumapage(context: MangaLoaderContext) :
 	LegacyPagedMangaParser(context, MangaParserSource.KUMAPAGE, 14) {
@@ -116,7 +118,6 @@ internal class Kumapage(context: MangaLoaderContext) :
 				rating = RATING_UNKNOWN,
 				state = null,
 				coverUrl = img,
-                // TODO: Check if manga is NSFW by checking the genre
 				contentRating = if (isNsfwSource) ContentRating.ADULT else null,
 				source = source,
 			)
@@ -166,21 +167,29 @@ internal class Kumapage(context: MangaLoaderContext) :
 		val doc = webClient.httpGet(chapter.url.toAbsoluteUrl(domain)).parseHtml()
 		return doc.select("div.content_place img").mapNotNull { img ->
 			val url = img.attr("src")
-			MangaPage(
-				id = generateUid(url),
-				url = url,
-				preview = null,
-				source = source,
-			)
+			if (!img.hasClass("ui") && !img.hasClass("avatar") && !img.hasClass("image")) {
+				MangaPage(
+					id = generateUid(url),
+					url = url,
+					preview = null,
+					source = source,
+				)
+			} else {
+				null
+			}
 		}
 	}
 
     private suspend fun fetchTags(): Set<MangaTag> {
         val doc = webClient.httpGet("https://$domain/search").parseHtml()
-		return doc.select("select#genre option").map { option ->
-			val key = option.attr("value")
-			val title = option.text()
-            MangaTag(title = title, key = key, source = source)
-		}.toSet()
-	}
+        return doc.select("select#genre option").mapNotNull { option ->
+            val key = option.attr("value")
+            val title = option.text()
+            if (title != "All Genres") { // remove "all" tags to avoid "Nothing found"
+                MangaTag(title = title, key = key, source = source)
+            } else {
+                null
+            }
+        }.toSet()
+    }
 }
\ No newline at end of file