diff --git a/apps/search_indexes/documents/establishment.py b/apps/search_indexes/documents/establishment.py
index 5d45c45b..6a00f0f1 100644
--- a/apps/search_indexes/documents/establishment.py
+++ b/apps/search_indexes/documents/establishment.py
@@ -39,13 +39,15 @@ class EstablishmentDocument(Document):
                                        }),
         },
         multi=True)
-    # tags = fields.ObjectField(
-    #     properties={
-    #         'tag': fields.ObjectField(properties={
-    #                                       'id': fields.IntegerField(),
-    #                                   }),
-    #     },
-    #     multi=True)
+    tags = fields.ObjectField(
+        properties={
+            'id': fields.IntegerField(attr='id'),
+            'label': fields.ObjectField(attr='label_indexing',
+                                        properties=OBJECT_FIELD_PROPERTIES),
+            'category': fields.ObjectField(attr='category',
+                                           properties={'id': fields.IntegerField()})
+        },
+        multi=True)
     address = fields.ObjectField(
         properties={
             'id': fields.IntegerField(),
diff --git a/apps/search_indexes/documents/news.py b/apps/search_indexes/documents/news.py
index 62049c05..25eec31d 100644
--- a/apps/search_indexes/documents/news.py
+++ b/apps/search_indexes/documents/news.py
@@ -24,15 +24,15 @@ class NewsDocument(Document):
     country = fields.ObjectField(properties={'id': fields.IntegerField(),
                                              'code': fields.KeywordField()})
     web_url = fields.KeywordField(attr='web_url')
-    # tags = fields.ObjectField(
-    #     properties={
-    #         'id': fields.IntegerField(attr='metadata.id'),
-    #         'label': fields.ObjectField(attr='metadata.label_indexing',
-    #                                     properties=OBJECT_FIELD_PROPERTIES),
-    #         'category': fields.ObjectField(attr='metadata.category',
-    #                                        properties={'id': fields.IntegerField()})
-    #     },
-    #     multi=True)
+    tags = fields.ObjectField(
+        properties={
+            'id': fields.IntegerField(attr='id'),
+            'label': fields.ObjectField(attr='label_indexing',
+                                        properties=OBJECT_FIELD_PROPERTIES),
+            'category': fields.ObjectField(attr='category',
+                                           properties={'id': fields.IntegerField()})
+        },
+        multi=True)
 
     class Django: