diff --git a/invenio_vocabularies/contrib/funders/mappings/os-v1/funders/funder-v2.0.0.json b/invenio_vocabularies/contrib/funders/mappings/os-v1/funders/funder-v2.0.0.json
index e047a159..20dd20ce 100644
--- a/invenio_vocabularies/contrib/funders/mappings/os-v1/funders/funder-v2.0.0.json
+++ b/invenio_vocabularies/contrib/funders/mappings/os-v1/funders/funder-v2.0.0.json
@@ -14,8 +14,8 @@
           "type": "custom",
           "char_filter": ["strip_special_chars"],
           "filter": [
-            "lowercase",
-            "asciifolding",
+            "lowercasepreserveoriginal",
+            "asciifoldingpreserveoriginal",
             "edgegrams"
           ]
         },
@@ -24,8 +24,8 @@
           "type": "custom",
           "char_filter": ["strip_special_chars"],
           "filter": [
-            "lowercase",
-            "asciifolding"
+            "lowercasepreserveoriginal",
+            "asciifoldingpreserveoriginal"
           ]
         }
       },
@@ -40,11 +40,11 @@
         }
       },
       "filter": {
-        "lowercase": {
+        "lowercasepreserveoriginal": {
           "type": "lowercase",
           "preserve_original": true
         },
-        "asciifolding": {
+        "asciifoldingpreserveoriginal": {
           "type": "asciifolding",
           "preserve_original": true
         },
diff --git a/invenio_vocabularies/contrib/funders/mappings/os-v2/funders/funder-v2.0.0.json b/invenio_vocabularies/contrib/funders/mappings/os-v2/funders/funder-v2.0.0.json
index e047a159..20dd20ce 100644
--- a/invenio_vocabularies/contrib/funders/mappings/os-v2/funders/funder-v2.0.0.json
+++ b/invenio_vocabularies/contrib/funders/mappings/os-v2/funders/funder-v2.0.0.json
@@ -14,8 +14,8 @@
           "type": "custom",
           "char_filter": ["strip_special_chars"],
           "filter": [
-            "lowercase",
-            "asciifolding",
+            "lowercasepreserveoriginal",
+            "asciifoldingpreserveoriginal",
             "edgegrams"
           ]
         },
@@ -24,8 +24,8 @@
           "type": "custom",
           "char_filter": ["strip_special_chars"],
           "filter": [
-            "lowercase",
-            "asciifolding"
+            "lowercasepreserveoriginal",
+            "asciifoldingpreserveoriginal"
           ]
         }
       },
@@ -40,11 +40,11 @@
         }
       },
       "filter": {
-        "lowercase": {
+        "lowercasepreserveoriginal": {
           "type": "lowercase",
           "preserve_original": true
         },
-        "asciifolding": {
+        "asciifoldingpreserveoriginal": {
           "type": "asciifolding",
           "preserve_original": true
         },