diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php
index 85f4c87ce..7df73e8c7 100644
--- a/src/Wallabag/CoreBundle/Controller/TagController.php
+++ b/src/Wallabag/CoreBundle/Controller/TagController.php
@@ -193,7 +193,7 @@ class TagController extends Controller
     }
 
     /**
-     * Tag search results with the current search term
+     * Tag search results with the current search term.
      *
      * @Route("/tag/search/{filter}", name="tag_this_search")
      *
@@ -201,7 +201,7 @@ class TagController extends Controller
      */
     public function tagThisSearchAction($filter, Request $request)
     {
-        $currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : '');
+        $currentRoute = $request->query->has('currentRoute') ? $request->query->get('currentRoute') : '';
 
         /** @var QueryBuilder $qb */
         $qb = $this->get('wallabag_core.entry_repository')->getBuilderForSearchByUser($this->getUser()->getId(), $filter, $currentRoute);
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 822ef72bc..81d4c615d 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -237,7 +237,7 @@ entry:
         toogle_as_star: Toggle starred
         delete: Delete
         export_title: Export
-        assign_search_tag: Assign this search to results
+        assign_search_tag: Assign this search as a tag to each result
     filters:
         title: Filters
         status_label: Status
diff --git a/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php b/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
index aaa0c7e4d..e3d3ff5e0 100644
--- a/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
@@ -482,12 +482,6 @@ class TagControllerTest extends WallabagCoreTestCase
         $this->logInAs('admin');
         $client = $this->getClient();
 
-        $entry = new Entry($this->getLoggedInUser());
-        $entry->setUrl('https://wallabag/');
-        $entry->setTitle('title');
-        $this->getEntityManager()->persist($entry);
-        $this->getEntityManager()->flush();
-
         // Search on unread list
         $crawler = $client->request('GET', '/unread/list');
 
@@ -498,17 +492,19 @@ class TagControllerTest extends WallabagCoreTestCase
 
         $crawler = $client->submit($form, $data);
 
-        $crawler = $client->click($crawler->selectLink('entry.list.assign_search_tag')->link());
-        $crawler = $client->followRedirect();
+        $client->click($crawler->selectLink('entry.list.assign_search_tag')->link());
+        $client->followRedirect();
 
         $entries = $client->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository('WallabagCoreBundle:Entry')
-            ->getBuilderForSearchByUser($this->getLoggedInUserId(), 'title', 'unread');
+            ->getBuilderForSearchByUser($this->getLoggedInUserId(), 'title', 'unread')
+            ->getQuery()->getResult();
 
         foreach ($entries as $entry) {
-            $tags = $entry->getTags()->toArray();
-            $this->assertStringContainsString('title', $tags);
+            $tags = $entry->getTagsLabel();
+
+            $this->assertContains('title', $tags);
         }
     }
 }