diff --git a/admin/searchengine/elasticsearch/mappings.yaml b/admin/searchengine/elasticsearch/mappings.yaml
index 045e9e9a45..6f69baf483 100644
--- a/admin/searchengine/elasticsearch/mappings.yaml
+++ b/admin/searchengine/elasticsearch/mappings.yaml
@@ -3558,22 +3558,12 @@ biblios:
     mandatory: ~
     mappings:
     - facet: 1
-      marc_field: 600a
+      marc_field: 600at
       marc_type: marc21
       sort: 1
       suggestible: 1
     - facet: 1
-      marc_field: 600t
-      marc_type: marc21
-      sort: 1
-      suggestible: 1
-    - facet: 1
-      marc_field: 610a
-      marc_type: marc21
-      sort: 1
-      suggestible: 1
-    - facet: 1
-      marc_field: 610t
+      marc_field: 610at
       marc_type: marc21
       sort: 1
       suggestible: 1
@@ -3583,57 +3573,12 @@ biblios:
       sort: 1
       suggestible: 1
     - facet: 1
-      marc_field: 630a
+      marc_field: 630anr
       marc_type: marc21
       sort: 1
       suggestible: 1
     - facet: 1
-      marc_field: 630n
-      marc_type: marc21
-      sort: 1
-      suggestible: 1
-    - facet: 1
-      marc_field: 630r
-      marc_type: marc21
-      sort: 1
-      suggestible: 1
-    - facet: 1
-      marc_field: 650a
-      marc_type: marc21
-      sort: 1
-      suggestible: 1
-    - facet: 1
-      marc_field: 650b
-      marc_type: marc21
-      sort: 1
-      suggestible: 1
-    - facet: 1
-      marc_field: 650c
-      marc_type: marc21
-      sort: 1
-      suggestible: 1
-    - facet: 1
-      marc_field: 650d
-      marc_type: marc21
-      sort: 1
-      suggestible: 1
-    - facet: 1
-      marc_field: 650v
-      marc_type: marc21
-      sort: 1
-      suggestible: 1
-    - facet: 1
-      marc_field: 650x
-      marc_type: marc21
-      sort: 1
-      suggestible: 1
-    - facet: 1
-      marc_field: 650y
-      marc_type: marc21
-      sort: 1
-      suggestible: 1
-    - facet: 1
-      marc_field: 650z
+      marc_field: 650abcdvxyz
       marc_type: marc21
       sort: 1
       suggestible: 1