diff --git a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
index f2635eb..124c385 100644
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
@@ -71,6 +71,10 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
                         displayedItems == ItemType.ALL ||
                                 (it.unread && displayedItems == ItemType.UNREAD) ||
                                 (it.starred && displayedItems == ItemType.STARRED)
+                    }.filter {
+                        tagFilter == null || it.tags.contains(tagFilter!!.tag)
+                    }.filter {
+                        sourceFilter == null || it.sourcetitle == sourceFilter!!.title
                     }.map { it.toView() }
                 )
             }