diff --git a/src/mapping.ts b/src/mapping.ts
index e6c3d5ac..1af79d29 100644
--- a/src/mapping.ts
+++ b/src/mapping.ts
@@ -410,7 +410,7 @@ function addAggregatable(path: string, topTypeName: string, global: boolean) {
 
   (aggregations[global ? '@all' : topTypeName] as ESNestedAggregation).aggs[property] = {
     terms: {
-      field: `${property}.keyword`,
+      field: `${property}.raw`,
       size: 1000,
     },
   };