diff --git a/sonar/modules/documents/mappings/v7/documents/document-v1.0.0.json b/sonar/modules/documents/mappings/v7/documents/document-v1.0.0.json
index e5219c63..9f4080f7 100644
--- a/sonar/modules/documents/mappings/v7/documents/document-v1.0.0.json
+++ b/sonar/modules/documents/mappings/v7/documents/document-v1.0.0.json
@@ -430,83 +430,6 @@
                   }
                 }
               },
-              "identifiers": {
-                "type": "object",
-                "properties": {
-                  "audioissuenumber": {
-                    "type": "keyword"
-                  },
-                  "doi": {
-                    "type": "keyword"
-                  },
-                  "ean": {
-                    "type": "keyword"
-                  },
-                  "gtin14number": {
-                    "type": "keyword"
-                  },
-                  "ark": {
-                    "type": "keyword"
-                  },
-                  "identifier": {
-                    "type": "keyword"
-                  },
-                  "isan": {
-                    "type": "keyword"
-                  },
-                  "isbn": {
-                    "type": "keyword"
-                  },
-                  "ismn": {
-                    "type": "keyword"
-                  },
-                  "isrc": {
-                    "type": "keyword"
-                  },
-                  "issn": {
-                    "type": "keyword"
-                  },
-                  "local": {
-                    "type": "keyword"
-                  },
-                  "issnl": {
-                    "type": "keyword"
-                  },
-                  "matrixnumber": {
-                    "type": "keyword"
-                  },
-                  "musicdistributornumber": {
-                    "type": "keyword"
-                  },
-                  "musicplate": {
-                    "type": "keyword"
-                  },
-                  "musicpublishernumber": {
-                    "type": "keyword"
-                  },
-                  "publishernumber": {
-                    "type": "keyword"
-                  },
-                  "upc": {
-                    "type": "keyword"
-                  },
-                  "urn": {
-                    "type": "keyword"
-                  },
-                  "videorecordingnumber": {
-                    "type": "keyword"
-                  },
-                  "uri": {
-                    "type": "keyword"
-                  },
-                  "reportnumber": {
-                    "type": "keyword"
-                  },
-                  "strn": {
-                    "type": "keyword"
-                  }
-                }
-              },
               "date_of_birth": {
                 "type": "keyword"
               },
@@ -713,76 +636,196 @@
         "type": "object",
         "properties": {
           "audioissuenumber": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           },
           "doi": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           },
           "ean": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           },
           "gtin14number": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           },
           "ark": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           },
           "identifier": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           },
           "isan": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           },
           "isbn": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           },
           "ismn": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           },
           "isrc": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           },
           "issn": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           },
           "local": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           },
           "issnl": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           },
           "matrixnumber": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           },
           "musicdistributornumber": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           },
           "musicplate": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           },
           "musicpublishernumber": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           },
           "publishernumber": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           },
           "upc": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           },
           "urn": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           },
           "videorecordingnumber": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           },
           "uri": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           },
           "reportnumber": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           },
           "strn": {
-            "type": "keyword"
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
           }
         }
       },
diff --git a/tests/api/documents/test_documents_query.py b/tests/api/documents/test_documents_query.py
index c8cad712..e3982f6b 100644
--- a/tests/api/documents/test_documents_query.py
+++ b/tests/api/documents/test_documents_query.py
@@ -37,6 +37,17 @@ def test_collection_query(db, client, document, collection, es_clear):
     assert res.json['hits']['total']['value'] == 1
 
 
+def test_identifiers_query(client, document, es_clear):
+    """Test identifiers search query."""
+
+    res = client.get(
+        url_for('invenio_records_rest.doc_list',
+                view='org',
+                q='identifiers.local.text:(R003415*)'))
+    assert res.status_code == 200
+    assert res.json['hits']['total']['value'] == 1
+
+
 def test_masked_document(db, client, organisation, document, es_clear):
     """Test masked document."""
     # Not masked (property not exists)