diff --git a/src/Page/Options.elm b/src/Page/Options.elm
index fd2ae4f..7693251 100644
--- a/src/Page/Options.elm
+++ b/src/Page/Options.elm
@@ -288,9 +288,9 @@ makeRequest options channel query from size sort =
             sort
             "option"
             "option_name"
-            [ "option_name^2"
-            , "option_name_query^2"
-            , "option_description^1"
+            [ "option_name^2.2"
+            , "option_name_query^2.1"
+            , "option_description^1."
             ]
         )
         ("latest-" ++ String.fromInt options.mappingSchemaVersion ++ "-" ++ channel)
diff --git a/src/Page/Packages.elm b/src/Page/Packages.elm
index d4afd10..e3a8826 100644
--- a/src/Page/Packages.elm
+++ b/src/Page/Packages.elm
@@ -414,11 +414,11 @@ makeRequest options channel query from size sort =
             sort
             "package"
             "package_attr_name"
-            [ "package_attr_name^2"
-            , "package_attr_name_query^2"
-            , "package_pname^2"
-            , "package_description^1"
-            , "package_longDescription^1"
+            [ "package_attr_name^2.3"
+            , "package_pname^2.2"
+            , "package_attr_name_query^2.1"
+            , "package_description^1."
+            , "package_longDescription^1."
             ]
         )
         ("latest-" ++ String.fromInt options.mappingSchemaVersion ++ "-" ++ channel)
diff --git a/src/Search.elm b/src/Search.elm
index aef72f1..14487ff 100644
--- a/src/Search.elm
+++ b/src/Search.elm
@@ -748,17 +748,17 @@ search_fields query fields =
             (\queryIndex queryWord ->
                 [ ( "multi_match"
                   , Json.Encode.object
-                        [ ( "type", Json.Encode.string "most_fields" )
+                        [ ( "type", Json.Encode.string "bool_prefix" )
                         , ( "query", Json.Encode.string queryWord )
                         , ( "fuzziness", Json.Encode.int <| String.length queryWord // 5 )
-                        , ( "analyzer", Json.Encode.string "whitespace" )
+                        , ( "prefix_length", Json.Encode.int 3 )
                         , ( "operator", Json.Encode.string "or" )
                         , ( "_name"
                           , Json.Encode.string <| "multi_match_" ++ queryWord ++ "_" ++ (queryIndex + 1 |> String.fromInt)
                           )
                         , ( "fields"
                           , Json.Encode.list Json.Encode.string
-                                (List.map (\field -> field ++ "." ++ (queryIndex + 1 |> String.fromInt)) fields)
+                                (List.map (\field -> field ++ (queryIndex + 1 |> String.fromInt)) fields)
                           )
                         ]
                   )