diff --git a/src/Repository/Blog/CommentRepositoryQuery.php b/src/Repository/Blog/CommentRepositoryQuery.php
index ade6658..6623a60 100644
--- a/src/Repository/Blog/CommentRepositoryQuery.php
+++ b/src/Repository/Blog/CommentRepositoryQuery.php
@@ -17,29 +17,13 @@ class CommentRepositoryQuery extends RepositoryQuery
         parent::__construct($repository, 'c', $paginator);
     }
 
-    public function useFilters(array $filters)
+    protected function filterHandler(string $name, $value)
     {
-        foreach ($filters as $name => $value) {
-            if (null === $value) {
-                continue;
-            }
-
-            if (is_int($value) || is_bool($value)) {
-                $this->andWhere('.'.$name.' = :'.$name);
-                $this->setParameter(':'.$name, $value);
-            } elseif (is_string($value)) {
-                $this->andWhere('.'.$name.' LIKE :'.$name);
-                $this->setParameter(':'.$name, '%'.$value.'%');
-            } else {
-                if ('post' === $name) {
-                    $this
-                        ->andWhere('.post = :postId')
-                        ->setParameter(':postId', $value->getId())
-                    ;
-                }
-            }
+        if ('post' === $name) {
+            $this
+                ->andWhere('.post = :postId')
+                ->setParameter(':postId', $value->getId())
+            ;
         }
-
-        return $this;
     }
 }
diff --git a/src/Repository/Blog/PostRepositoryQuery.php b/src/Repository/Blog/PostRepositoryQuery.php
index cc34575..fd4f26e 100644
--- a/src/Repository/Blog/PostRepositoryQuery.php
+++ b/src/Repository/Blog/PostRepositoryQuery.php
@@ -40,27 +40,11 @@ class PostRepositoryQuery extends RepositoryQuery
         ;
     }
 
-    public function useFilters(array $filters)
+    protected function filterHandler(string $name, $value)
     {
-        foreach ($filters as $name => $value) {
-            if (null === $value) {
-                continue;
-            }
-
-            if (is_int($value) || is_bool($value)) {
-                $this->andWhere('.'.$name.' = :'.$name);
-                $this->setParameter(':'.$name, $value);
-            } elseif (is_string($value)) {
-                $this->andWhere('.'.$name.' LIKE :'.$name);
-                $this->setParameter(':'.$name, '%'.$value.'%');
-            } else {
-                if ('category' === $name) {
-                    $this->inCategory($value);
-                }
-            }
+        if ('category' === $name) {
+            $this->inCategory($value);
         }
-
-        return $this;
     }
 
     public function search(?string $keywords, ?string $tag)