diff --git a/app/src/main/java/com/pixelized/biblib/ui/screen/home/page/search/SearchViewModel.kt b/app/src/main/java/com/pixelized/biblib/ui/screen/home/page/search/SearchViewModel.kt
index ce59652..ca26857 100644
--- a/app/src/main/java/com/pixelized/biblib/ui/screen/home/page/search/SearchViewModel.kt
+++ b/app/src/main/java/com/pixelized/biblib/ui/screen/home/page/search/SearchViewModel.kt
@@ -76,16 +76,16 @@ class SearchViewModel @Inject constructor(
             paging.filter { it.title.contains(filter, ignoreCase = true) }
         }
         .combine(authors.confirmFlow) { paging, filter ->
-            paging.filter { filter == null || it.author.isEmpty() || it.author.any { author -> author.id == filter.id } }
+            paging.filter { filter == null || it.author.any { author -> author.id == filter.id } }
         }
         .combine(series.confirmFlow) { paging, filter ->
-            paging.filter { filter == null || it.series == null || it.series.id == filter.id }
+            paging.filter { filter == null || it.series?.id == filter.id }
         }
         .combine(genre.confirmFlow) { paging, filter ->
-            paging.filter { filter == null || it.genre.isNullOrEmpty() || it.genre.any { author -> author.id == filter.id } }
+            paging.filter { filter == null || it.genre?.any { author -> author.id == filter.id } ?: false}
         }
         .combine(language.confirmFlow) { paging, filter ->
-            paging.filter { filter == null || it.language == null || it.language.id == filter.id }
+            paging.filter { filter == null || it.language?.id == filter.id }
         }
         .map { paging -> paging.map { it.toMicroThumbnailUio() } }