diff --git a/AUTHORS.rst b/AUTHORS.rst
index 5be3cfd6..c7aff636 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -20,10 +20,7 @@ answer newbie questions, and generally made taiga that much better:
 - Andrea Stagi <stagi.andrea@gmail.com>
 - Andrés Moya <andres.moya@kaleidos.net>
 - Andrey Alekseenko <al42and@gmail.com>
-<<<<<<< HEAD
-=======
 - Brett Profitt <brett.profitt@gmail.com>
->>>>>>> master
 - Bruno Clermont <bruno@robotinfra.com>
 - Chris Wilson <chris.wilson@aridhia.com>
 - David Burke <david@burkesoftware.com>
@@ -33,6 +30,7 @@ answer newbie questions, and generally made taiga that much better:
 - Julien Palard
 - luyikei <luyikei.qmltu@gmail.com>
 - Motius GmbH <mail@motius.de>
+- Riccardo Coccioli <riccardo.coccioli@immobiliare.it>
 - Ricky Posner <e@eposner.com>
 - Yamila Moreno <yamila.moreno@kaleidos.net>
 - Yaser Alraddadi <yaser@yr.sa>
diff --git a/taiga/searches/services.py b/taiga/searches/services.py
index 4dcda86f..5e04518a 100644
--- a/taiga/searches/services.py
+++ b/taiga/searches/services.py
@@ -28,6 +28,7 @@ def search_user_stories(project, text):
     model_cls = apps.get_model("userstories", "UserStory")
     where_clause = ("to_tsvector('english_nostop', coalesce(userstories_userstory.subject) || ' ' || "
                                 "coalesce(userstories_userstory.ref) || ' ' || "
+                                "coalesce(array_to_string(userstories_userstory.tags, ' '), '') || ' ' || "
                                 "coalesce(userstories_userstory.description, '')) "
                     "@@ to_tsquery('english_nostop', %s)")
 
@@ -44,6 +45,7 @@ def search_tasks(project, text):
     model_cls = apps.get_model("tasks", "Task")
     where_clause = ("to_tsvector('english_nostop', coalesce(tasks_task.subject, '') || ' ' || "
                     "coalesce(tasks_task.ref) || ' ' || "
+                    "coalesce(array_to_string(tasks_task.tags, ' '), '') || ' ' || "
                     "coalesce(tasks_task.description, '')) @@ to_tsquery('english_nostop', %s)")
 
     if text:
@@ -57,6 +59,7 @@ def search_issues(project, text):
     model_cls = apps.get_model("issues", "Issue")
     where_clause = ("to_tsvector('english_nostop', coalesce(issues_issue.subject) || ' ' || "
                     "coalesce(issues_issue.ref) || ' ' || "
+                    "coalesce(array_to_string(issues_issue.tags, ' '), '') || ' ' || "
                     "coalesce(issues_issue.description, '')) @@ to_tsquery('english_nostop', %s)")
 
     if text: