diff --git a/databuilder/publisher/elasticsearch_constants.py b/databuilder/publisher/elasticsearch_constants.py
index 9b61ff0629..1e407ef2ef 100644
--- a/databuilder/publisher/elasticsearch_constants.py
+++ b/databuilder/publisher/elasticsearch_constants.py
@@ -16,7 +16,6 @@
             "name": {
               "type":"text",
               "analyzer": "simple",
-              "search_analyzer": "whitespace",
               "fields": {
                 "raw": {
                   "type": "keyword"
@@ -26,7 +25,6 @@
             "schema": {
               "type":"text",
               "analyzer": "simple",
-              "search_analyzer": "whitespace",
               "fields": {
                 "raw": {
                   "type": "keyword"
@@ -42,12 +40,11 @@
             },
             "description": {
               "type": "text",
-              "analyzer": "simple",
-              "search_analyzer": "whitespace"
+              "analyzer": "simple"
             },
             "column_names": {
               "type":"text",
-              "analyzer": "whitespace",
+              "analyzer": "simple",
               "fields": {
                 "raw": {
                   "type": "keyword"
@@ -56,8 +53,7 @@
             },
             "column_descriptions": {
               "type": "text",
-              "analyzer": "simple",
-              "search_analyzer": "whitespace"
+              "analyzer": "simple"
             },
             "tags": {
               "type": "keyword"
@@ -70,7 +66,7 @@
             },
             "database": {
               "type": "text",
-              "analyzer": "whitespace",
+              "analyzer": "simple",
               "fields": {
                 "raw": {
                   "type": "keyword"
diff --git a/setup.py b/setup.py
index 1d3e37e348..c14502e043 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup, find_packages
 
 
-__version__ = '2.5.18'
+__version__ = '2.5.19'
 
 requirements_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'requirements.txt')
 with open(requirements_path) as requirements_file: