Merge d21c48b8fe into 4f062c8c7b

app/services/account_search_service.rb

@@ -151,10 +151,9 @@ class AccountSearchService < BaseService
             },
 
             {
-              multi_match: {
+              combined_fields: {
                 query: @query,
-                type: 'best_fields',
-                fields: %w(text text.*),
+                fields: %w(username^2 display_name^2 text),
                 operator: 'and',
               },
             },