diff --git a/query/autocomplete_defaults.js b/query/autocomplete_defaults.js
index 3c634c891..b4785465f 100644
--- a/query/autocomplete_defaults.js
+++ b/query/autocomplete_defaults.js
@@ -138,7 +138,7 @@ module.exports = _.merge({}, peliasQuery.defaults, {
   'popularity:field': 'popularity',
   'popularity:modifier': 'log1p',
   'popularity:max_boost': 20,
-  'popularity:weight': 1,
+  'popularity:weight': 5,
 
   'population:field': 'population',
   'population:modifier': 'log1p',
diff --git a/test/unit/fixture/autocomplete_boundary_country.js b/test/unit/fixture/autocomplete_boundary_country.js
index 64a70552c..5b3772d29 100644
--- a/test/unit/fixture/autocomplete_boundary_country.js
+++ b/test/unit/fixture/autocomplete_boundary_country.js
@@ -29,7 +29,7 @@ module.exports = {
               'field': 'popularity',
               'missing': 1
             },
-            'weight': 1
+            'weight': 5
           }]
         }
       },{
diff --git a/test/unit/fixture/autocomplete_boundary_gid.js b/test/unit/fixture/autocomplete_boundary_gid.js
index 5ccb058ca..89e6c413b 100644
--- a/test/unit/fixture/autocomplete_boundary_gid.js
+++ b/test/unit/fixture/autocomplete_boundary_gid.js
@@ -29,7 +29,7 @@ module.exports = {
               'field': 'popularity',
               'missing': 1
             },
-            'weight': 1
+            'weight': 5
           }]
         }
       },{
diff --git a/test/unit/fixture/autocomplete_custom_boosts.json b/test/unit/fixture/autocomplete_custom_boosts.json
index 556f1452b..701ceb269 100644
--- a/test/unit/fixture/autocomplete_custom_boosts.json
+++ b/test/unit/fixture/autocomplete_custom_boosts.json
@@ -29,7 +29,7 @@
                     "field": "popularity",
                     "missing": 1
                   },
-                  "weight": 1
+                  "weight": 5
                 }
               ],
               "score_mode": "first",
diff --git a/test/unit/fixture/autocomplete_linguistic_bbox_san_francisco.js b/test/unit/fixture/autocomplete_linguistic_bbox_san_francisco.js
index 787450f4a..0c5a0a173 100644
--- a/test/unit/fixture/autocomplete_linguistic_bbox_san_francisco.js
+++ b/test/unit/fixture/autocomplete_linguistic_bbox_san_francisco.js
@@ -29,7 +29,7 @@ module.exports = {
               'field': 'popularity',
               'missing': 1
             },
-            'weight': 1
+            'weight': 5
           }]
         }
       },{
diff --git a/test/unit/fixture/autocomplete_linguistic_circle_san_francisco.js b/test/unit/fixture/autocomplete_linguistic_circle_san_francisco.js
index fdeb8757f..28e031a9a 100644
--- a/test/unit/fixture/autocomplete_linguistic_circle_san_francisco.js
+++ b/test/unit/fixture/autocomplete_linguistic_circle_san_francisco.js
@@ -33,7 +33,7 @@ module.exports = {
                   'field': 'popularity',
                   'missing': 1
                 },
-                'weight': 1
+                'weight': 5
               }
             ],
             'score_mode': 'first',
diff --git a/test/unit/fixture/autocomplete_linguistic_final_token.js b/test/unit/fixture/autocomplete_linguistic_final_token.js
index 43ffa2783..b983d3c63 100644
--- a/test/unit/fixture/autocomplete_linguistic_final_token.js
+++ b/test/unit/fixture/autocomplete_linguistic_final_token.js
@@ -25,7 +25,7 @@ module.exports = {
               'field': 'popularity',
               'missing': 1
             },
-            'weight': 1
+            'weight': 5
           }]
         }
       },{
diff --git a/test/unit/fixture/autocomplete_linguistic_focus.js b/test/unit/fixture/autocomplete_linguistic_focus.js
index bfde87014..27d32468a 100644
--- a/test/unit/fixture/autocomplete_linguistic_focus.js
+++ b/test/unit/fixture/autocomplete_linguistic_focus.js
@@ -51,7 +51,7 @@ module.exports = {
               'field': 'popularity',
               'missing': 1
             },
-            'weight': 1
+            'weight': 5
           }]
         }
       },{
diff --git a/test/unit/fixture/autocomplete_linguistic_focus_null_island.js b/test/unit/fixture/autocomplete_linguistic_focus_null_island.js
index 5ceed3548..6acbab32d 100644
--- a/test/unit/fixture/autocomplete_linguistic_focus_null_island.js
+++ b/test/unit/fixture/autocomplete_linguistic_focus_null_island.js
@@ -51,7 +51,7 @@ module.exports = {
               'field': 'popularity',
               'missing': 1
             },
-            'weight': 1
+            'weight': 5
           }]
         }
       },{
diff --git a/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js b/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js
index 157c224d1..f0b96b0c8 100644
--- a/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js
+++ b/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js
@@ -53,7 +53,7 @@ module.exports = {
               'field': 'popularity',
               'missing': 1
             },
-            'weight': 1
+            'weight': 5
           }]
         }
       },{
diff --git a/test/unit/fixture/autocomplete_linguistic_multiple_tokens_complete_numeric.js b/test/unit/fixture/autocomplete_linguistic_multiple_tokens_complete_numeric.js
index 3bb89a8fa..1e3de027d 100644
--- a/test/unit/fixture/autocomplete_linguistic_multiple_tokens_complete_numeric.js
+++ b/test/unit/fixture/autocomplete_linguistic_multiple_tokens_complete_numeric.js
@@ -40,7 +40,7 @@ module.exports = {
                 'field': 'popularity',
                 'missing': 1
               },
-              'weight': 1
+              'weight': 5
             }]
           }
         }, {
diff --git a/test/unit/fixture/autocomplete_linguistic_one_char_token.js b/test/unit/fixture/autocomplete_linguistic_one_char_token.js
index 7a4286910..bd57da1ee 100644
--- a/test/unit/fixture/autocomplete_linguistic_one_char_token.js
+++ b/test/unit/fixture/autocomplete_linguistic_one_char_token.js
@@ -29,7 +29,7 @@ module.exports = {
               'field': 'popularity',
               'missing': 1
             },
-            'weight': 1
+            'weight': 5
           }]
         }
       },{
diff --git a/test/unit/fixture/autocomplete_linguistic_only.js b/test/unit/fixture/autocomplete_linguistic_only.js
index b8c50a99d..3474e3b75 100644
--- a/test/unit/fixture/autocomplete_linguistic_only.js
+++ b/test/unit/fixture/autocomplete_linguistic_only.js
@@ -29,7 +29,7 @@ module.exports = {
               'field': 'popularity',
               'missing': 1
             },
-            'weight': 1
+            'weight': 5
           }]
         }
       },{
diff --git a/test/unit/fixture/autocomplete_linguistic_three_char_token.js b/test/unit/fixture/autocomplete_linguistic_three_char_token.js
index 79b2dea27..dbe0a3bd2 100644
--- a/test/unit/fixture/autocomplete_linguistic_three_char_token.js
+++ b/test/unit/fixture/autocomplete_linguistic_three_char_token.js
@@ -29,7 +29,7 @@ module.exports = {
               'field': 'popularity',
               'missing': 1
             },
-            'weight': 1
+            'weight': 5
           }]
         }
       },{
diff --git a/test/unit/fixture/autocomplete_linguistic_two_char_token.js b/test/unit/fixture/autocomplete_linguistic_two_char_token.js
index b95dafacd..99e085899 100644
--- a/test/unit/fixture/autocomplete_linguistic_two_char_token.js
+++ b/test/unit/fixture/autocomplete_linguistic_two_char_token.js
@@ -29,7 +29,7 @@ module.exports = {
               'field': 'popularity',
               'missing': 1
             },
-            'weight': 1
+            'weight': 5
           }]
         }
       },{
diff --git a/test/unit/fixture/autocomplete_linguistic_with_admin.js b/test/unit/fixture/autocomplete_linguistic_with_admin.js
index e162915fb..b070eac55 100644
--- a/test/unit/fixture/autocomplete_linguistic_with_admin.js
+++ b/test/unit/fixture/autocomplete_linguistic_with_admin.js
@@ -50,7 +50,7 @@ module.exports = {
                   'field': 'popularity',
                   'missing': 1
                 },
-                'weight': 1
+                'weight': 5
               }
             ],
             'score_mode': 'first',
diff --git a/test/unit/fixture/autocomplete_single_character_street.js b/test/unit/fixture/autocomplete_single_character_street.js
index 1c7e421e2..9501df638 100644
--- a/test/unit/fixture/autocomplete_single_character_street.js
+++ b/test/unit/fixture/autocomplete_single_character_street.js
@@ -48,7 +48,7 @@ module.exports = {
               'field': 'popularity',
               'missing': 1
             },
-            'weight': 1
+            'weight': 5
           }]
         }
       },{
diff --git a/test/unit/fixture/autocomplete_with_category_filtering.js b/test/unit/fixture/autocomplete_with_category_filtering.js
index 5ee33d85a..486da2127 100644
--- a/test/unit/fixture/autocomplete_with_category_filtering.js
+++ b/test/unit/fixture/autocomplete_with_category_filtering.js
@@ -29,7 +29,7 @@ module.exports = {
               'field': 'popularity',
               'missing': 1
             },
-            'weight': 1
+            'weight': 5
           }]
         }
       }, {
diff --git a/test/unit/fixture/autocomplete_with_layer_filtering.js b/test/unit/fixture/autocomplete_with_layer_filtering.js
index 916e5925a..271a8b5b4 100644
--- a/test/unit/fixture/autocomplete_with_layer_filtering.js
+++ b/test/unit/fixture/autocomplete_with_layer_filtering.js
@@ -29,7 +29,7 @@ module.exports = {
               'field': 'popularity',
               'missing': 1
             },
-            'weight': 1
+            'weight': 5
           }]
         }
       },{
diff --git a/test/unit/fixture/autocomplete_with_source_filtering.js b/test/unit/fixture/autocomplete_with_source_filtering.js
index af3eea8c2..58b5cbc7d 100644
--- a/test/unit/fixture/autocomplete_with_source_filtering.js
+++ b/test/unit/fixture/autocomplete_with_source_filtering.js
@@ -29,7 +29,7 @@ module.exports = {
               'field': 'popularity',
               'missing': 1
             },
-            'weight': 1
+            'weight': 5
           }]
         }
       },{