diff --git a/src/en/hahomoe/build.gradle b/src/en/hahomoe/build.gradle
index 94c24fe99..f70361883 100644
--- a/src/en/hahomoe/build.gradle
+++ b/src/en/hahomoe/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'haho.moe'
     pkgNameSuffix = 'en.hahomoe'
     extClass = '.HahoMoe'
-    extVersionCode = 6
+    extVersionCode = 7
     libVersion = '12'
     containsNsfw = true
 }
diff --git a/src/en/hahomoe/src/eu/kanade/tachiyomi/animeextension/en/hahomoe/HahoMoe.kt b/src/en/hahomoe/src/eu/kanade/tachiyomi/animeextension/en/hahomoe/HahoMoe.kt
index b39b98c1a..2da0c13c7 100644
--- a/src/en/hahomoe/src/eu/kanade/tachiyomi/animeextension/en/hahomoe/HahoMoe.kt
+++ b/src/en/hahomoe/src/eu/kanade/tachiyomi/animeextension/en/hahomoe/HahoMoe.kt
@@ -135,13 +135,11 @@ class HahoMoe : ParsedAnimeHttpSource() {
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
         val (includedTags, blackListedTags, orderBy, ordering) = getSearchParameters(filters)
 
-        val incTags = includedTags.joinToString(prefix = " genre:", separator = " genre:")
-        val excTags = blackListedTags.joinToString(prefix = " -genre:", separator = " -genre:")
-        return when {
-            (blackListedTags.isNotEmpty()) -> GET("$baseUrl/anime?q=title:$query$incTags$excTags&page=$page&s=$orderBy$ordering")
-            (includedTags.isNotEmpty()) -> GET("$baseUrl/anime?q=title:$query$incTags&page=$page&s=$orderBy$ordering")
-            else -> { GET("$baseUrl/anime?q=title:$query&page=$page&s=$orderBy$ordering") }
-        }
+        val incTags = includedTags.ifEmpty { null }
+            ?.joinToString(prefix = "+genre:", separator = "+genre:") ?: ""
+        val excTags = blackListedTags.ifEmpty { null }
+            ?.joinToString(prefix = "+-genre:", separator = "+-genre:") ?: ""
+        return GET("$baseUrl/anime?q=title:$query$incTags$excTags&page=$page&s=$orderBy$ordering")
     }
     override fun animeDetailsParse(document: Document): SAnime {
         val anime = SAnime.create()