diff --git a/src/main/resources/sql/functions/article/find_articles.sql b/src/main/resources/sql/functions/article/find_articles.sql
index e6103d8..87f91b0 100644
--- a/src/main/resources/sql/functions/article/find_articles.sql
+++ b/src/main/resources/sql/functions/article/find_articles.sql
@@ -9,7 +9,7 @@ create or replace function find_articles(
 ) language plpgsql as
 $$
 begin
-    select json_agg(t), (select count(id) from article a where (_search is null or _search = '' or a ==> dsl.multi_match('{title^3, content, description}', _search)) and a.last_version = true)
+    select json_agg(t), (select count(id) from article a where (_search is null or _search = '' or a ==> dsl.multi_match('{title^3, content, description, tags}', _search)) and a.last_version = true)
     into resource, total
     from (
         select
@@ -21,7 +21,7 @@ begin
         where (
               _search is null
            or _search = ''
-           or a ==> dsl.multi_match('{title^3, content, description}', _search)
+           or a ==> dsl.multi_match('{title^3, content, description, tags}', _search)
         ) and a.last_version = true
         order by
         _score desc,
diff --git a/src/main/resources/sql/migrations/0000-init_schema.up.sql b/src/main/resources/sql/migrations/0000-init_schema.up.sql
index 3ed5fa0..47acc8d 100644
--- a/src/main/resources/sql/migrations/0000-init_schema.up.sql
+++ b/src/main/resources/sql/migrations/0000-init_schema.up.sql
@@ -647,6 +647,12 @@ select zdb.define_field_mapping('article', 'description', '{
   "search_analyzer": "fr_analyzer"
 }');
 
+select zdb.define_field_mapping('article', 'tags', '{
+  "type": "text",
+  "analyzer": "name_analyzer",
+  "search_analyzer": "name_analyzer"
+}');
+
 create index article_idx
     on article
         using zombodb ((article.*))