diff --git a/Classes/Processing/BibElasticMapping.php b/Classes/Processing/BibElasticMapping.php
index 724172e..c911930 100644
--- a/Classes/Processing/BibElasticMapping.php
+++ b/Classes/Processing/BibElasticMapping.php
@@ -15,14 +15,14 @@ public static function getMappingParams(string $index): array
                 'mappings' => [
                     'dynamic' => false,
                     'properties' => [
-                        'itemType' => [ 'type' => 'text', 'fields' => [ 'keyword' => [ 'type' => 'keyword', 'ignore_above' => 256 ] ] ],
+                        'itemType' => [ 'type' => 'keyword' ],
                         'version' => [ 'type' => 'long' ],
                         'title' => [ 'type' => 'text'],
                         'university' => [ 'type' => 'text'],
                         'bookTitle' => [ 'type' => 'text'],
                         'series' => [ 'type' => 'text', 'fields' => [ 'keyword' => [ 'type' => 'keyword', 'ignore_above' => 256 ] ] ],
                         'publicationTitle' => [ 'type' => 'text', 'fields' => [ 'keyword' => [ 'type' => 'keyword', 'ignore_above' => 256 ] ] ],
-                        'language' => [ 'type' => 'text', 'fields' => [ 'keyword' => [ 'type' => 'keyword', 'ignore_above' => 256 ] ] ],
+                        'language' => [ 'type' => 'keyword' ],
                         'place' => [ 'type' => 'text', 'fields' => [ 'keyword' => [ 'type' => 'keyword', 'ignore_above' => 256 ] ] ],
                         'date' => [ 'type' => 'text', 'fields' => [ 'keyword' => [ 'type' => 'keyword', 'ignore_above' => 256 ] ] ],
                         'archiveLocation' => [ 'type' => 'text', 'fields' => [ 'keyword' => [ 'type' => 'keyword', 'ignore_above' => 256 ] ] ],
@@ -31,12 +31,7 @@ public static function getMappingParams(string $index): array
                             'type' => 'nested',
                             'properties' => [
                                 'creatorType' => [
-                                    'type' => 'text',
-                                    'fields' => [
-                                        'keyword' => [
-                                            'type' => 'keyword', 'ignore_above' => 256
-                                        ]
-                                    ]
+                                    'type' => 'keyword'
                                 ],
                                 'firstName' => [
                                     'type' => 'text',
diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.typoscript
index 208f40f..e79a435 100644
--- a/Configuration/TypoScript/setup.typoscript
+++ b/Configuration/TypoScript/setup.typoscript
@@ -38,7 +38,7 @@ plugin.tx_lisztcommon_searchlisting {
         filters {
           0 {
             field = itemType
-            type = terms
+            type = keyword
           }
           1 {
             field = creators
@@ -46,7 +46,7 @@ plugin.tx_lisztcommon_searchlisting {
             script (
               String firstName = doc['creators.firstName.keyword'].size() > 0 ? doc['creators.firstName.keyword'].value : '';
               String lastName = doc['creators.lastName.keyword'].size() > 0 ? doc['creators.lastName.keyword'].value : '';
-              String type = doc['creators.creatorType.keyword'].size() > 0 ? doc['creators.creatorType.keyword'].value : '';
+              String type = doc['creators.creatorType'].size() > 0 ? doc['creators.creatorType'].value : '';
               if (type == 'translator') {
                 return null;
               }
@@ -62,7 +62,7 @@ plugin.tx_lisztcommon_searchlisting {
           }
           3 {
             field = language
-            type = terms
+            type = keyword
           }
           4 {
             field = publicationTitle