diff --git a/complaints/ccdb/ccdb_mapping.json b/complaints/ccdb/ccdb_mapping.json
index fb52443..0f9905a 100644
--- a/complaints/ccdb/ccdb_mapping.json
+++ b/complaints/ccdb/ccdb_mapping.json
@@ -11,8 +11,8 @@
           "type": "keyword"
         },
         "suggest": {
-          "analyzer": "uppercase_analyzer",
-          "type": "text"
+          "type": "completion",
+          "analyzer": "entity"
         }
       },
       "analyzer": "cr_analyzer",
diff --git a/complaints/settings.json b/complaints/settings.json
index 01f2180..b827368 100644
--- a/complaints/settings.json
+++ b/complaints/settings.json
@@ -28,7 +28,19 @@
         "token_separator": " "
       }
     },
+    "char_filter": {
+      "entity": {
+        "type": "pattern_replace",
+        "pattern": "\\.",
+        "replacement": ""
+      }
+    },
     "analyzer": {
+      "entity": {
+        "type": "custom",
+        "tokenizer": "keyword",
+        "char_filter": ["entity"]
+      },
       "cr_analyzer": {
         "type": "custom",
         "tokenizer": "whitespace",