From 39da11cce681bf93c08b596c767508006b1e1a94 Mon Sep 17 00:00:00 2001
From: Bertrand Bordage <bordage.bertrand@gmail.com>
Date: Thu, 23 Nov 2017 16:23:48 +0100
Subject: [PATCH] Fixes Elasticsearch querying.

---
 .../wagtailsearch/backends/elasticsearch2.py  | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch2.py b/wagtail/wagtailsearch/backends/elasticsearch2.py
index 35e1af0d1..e65e9f912 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch2.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch2.py
@@ -384,23 +384,29 @@ class Elasticsearch2SearchQuery(BaseSearchQuery):
         operator = self.query.operator
 
         if len(fields) == 1:
-            field = fields[0]
-            query = {
+            if operator == 'or':
+                return {
+                    'match': {
+                        fields[0]: self.query.query_string,
+                    }
+                }
+            return {
                 'match': {
-                    field: self.query.query_string,
+                    fields[0]: {
+                        'query': self.query.query_string,
+                        'operator': operator,
+                    }
                 }
             }
-            if operator != 'or':
-                query['match'][field]['operator'] = operator
-        else:
-            query = {
-                'multi_match': {
-                    'query': self.query.query_string,
-                    'fields': fields,
-                }
+
+        query = {
+            'multi_match': {
+                'query': self.query.query_string,
+                'fields': fields,
             }
-            if operator != 'or':
-                query['multi_match']['operator'] = operator
+        }
+        if operator != 'or':
+            query['multi_match']['operator'] = operator
         return query
 
     def get_content_type_filter(self):