diff --git a/plugins/elasticsearch/helpers/elasticsearch_helper.rb b/plugins/elasticsearch/helpers/elasticsearch_helper.rb
index df9039a..13045e3 100644
--- a/plugins/elasticsearch/helpers/elasticsearch_helper.rb
+++ b/plugins/elasticsearch/helpers/elasticsearch_helper.rb
@@ -71,8 +71,8 @@ module ElasticsearchHelper
       }
     else
       query_exp = {
-        multi_match: {
-          query: expression.downcase,
+        query_string: {
+          query: "*"+expression.downcase+"*",
           fields: fields,
           tie_breaker: 0.4,
           minimum_should_match: "40%"
diff --git a/plugins/elasticsearch/test/test_helper.rb b/plugins/elasticsearch/test/test_helper.rb
index ff19baa..6cf0727 100644
--- a/plugins/elasticsearch/test/test_helper.rb
+++ b/plugins/elasticsearch/test/test_helper.rb
@@ -20,7 +20,7 @@ module ElasticsearchTestHelper
       model.__elasticsearch__.create_index! force: true
       model.import
     }
-    sleep 1
+    sleep 2
   end
 
   def setup_environment
diff --git a/plugins/elasticsearch/test/unit/helpers/elasticsearch_helper_test.rb b/plugins/elasticsearch/test/unit/helpers/elasticsearch_helper_test.rb
index 5bbba0d..da8d9d4 100644
--- a/plugins/elasticsearch/test/unit/helpers/elasticsearch_helper_test.rb
+++ b/plugins/elasticsearch/test/unit/helpers/elasticsearch_helper_test.rb
@@ -42,9 +42,9 @@ class ElasticsearchHelperTest < ActiveSupport::TestCase
     fields = ['name','login']
     result = query_method(query,fields)
 
-    assert_includes result.keys, :multi_match
-    assert_includes result[:multi_match][:query], query
-    assert_equivalent result[:multi_match][:fields], fields
+    assert_includes result.keys, :query_string
+    assert_includes result[:query_string][:query], query
+    assert_equivalent result[:query_string][:fields], fields
   end
 
 
--
libgit2 0.21.2