diff --git a/airflow/dags/EOSC_indexes.py b/airflow/dags/EOSC_indexes.py
index eecb4a4..1128d3f 100644
--- a/airflow/dags/EOSC_indexes.py
+++ b/airflow/dags/EOSC_indexes.py
@@ -680,7 +680,16 @@ mappings['products'] = {
 # EOSC CATALOG
 #
 mappings['services'] = {
+    ### SYNTHETIC FIELDS
+    "keyword": {
+        "path": "tags",
+        "type": "alias"
+    },
+    ### ORIGINAL FIELDS
     "properties": {
+        "accessRestriction": {
+            "type": "keyword"
+        },
         "access_modes": {
             "type": "keyword"
         },
@@ -763,6 +772,12 @@ mappings['services'] = {
         "tags": {
             "type": "keyword"
         },
+        "targetUsers": {
+            "type": "keyword"
+        },
+        "thematic": {
+            "type": "boolean"
+        },
         "type": {
             "type": "keyword"
         },