1 files changed, 17 insertions, 5 deletions

diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
index 8f23164f..51cfe4d1 100644
--- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
@@ -90,18 +90,30 @@ class EntryRepository extends EntityRepository
      *
      * @param int    $userId
      * @param string $term
+     * @param strint $currentRoute
      *
      * @return QueryBuilder
      */
-    public function getBuilderForSearchByUser($userId, $term)
+    public function getBuilderForSearchByUser($userId, $term, $currentRoute)
     {
-        return $this
-            ->getBuilderByUser($userId)
-            ->andWhere('e.content LIKE :term')->setParameter('term', '%'.$term.'%')
-            ->orWhere('e.title LIKE :term')->setParameter('term', '%'.$term.'%')
+        $qb = $this
+            ->getBuilderByUser($userId);
+
+        if ('starred' === $currentRoute) {
+            $qb->andWhere('e.isStarred = true');
+        } elseif ('unread' === $currentRoute) {
+            $qb->andWhere('e.isArchived = false');
+        } elseif ('archive' === $currentRoute) {
+            $qb->andWhere('e.isArchived = true');
+        }
+
+        $qb
+            ->andWhere('e.content LIKE :term OR e.title LIKE :term')->setParameter('term', '%'.$term.'%')
             ->leftJoin('e.tags', 't')
             ->groupBy('e.id')
             ->having('count(t.id) = 0');
+
+        return $qb;
     }
 
     /**