diff --git a/search/geocoder.cpp b/search/geocoder.cpp
index cc86f29f05..ecf67cae68 100644
--- a/search/geocoder.cpp
+++ b/search/geocoder.cpp
@@ -1113,7 +1113,7 @@ void Geocoder::LimitedSearch(BaseContext & ctx, FeaturesFilter const & filter,
 
   auto const search = [this, &ctx, &centers]() {
     GreedilyMatchStreets(ctx, centers);
-    MatchPOIsAndBuildings(ctx, 0 /* curToken */);
+    MatchPOIsAndBuildings(ctx, 0 /* curToken */, CBV::GetFull());
   };
 
   WithPostcodes(ctx, search);
@@ -1274,7 +1274,7 @@ void Geocoder::CreateStreetsLayerAndMatchLowerLayers(BaseContext & ctx,
   ScopedMarkTokens mark(ctx.m_tokens, BaseContext::TOKEN_TYPE_STREET, prediction.m_tokenRange);
   size_t const numEmitted = ctx.m_numEmitted;
 
-  MatchPOIsAndBuildings(ctx, 0 /* curToken */);
+  MatchPOIsAndBuildings(ctx, 0 /* curToken */, CBV::GetFull());
 
   // A relaxed best effort parse: at least show the street if we can find one.
   if (numEmitted == ctx.m_numEmitted && ctx.SkipUsedTokens(0) != ctx.m_numTokens)
diff --git a/search/geocoder.hpp b/search/geocoder.hpp
index c4ec59678e..ba8b91b7f1 100644
--- a/search/geocoder.hpp
+++ b/search/geocoder.hpp
@@ -256,8 +256,7 @@ private:
   // Tries to find all paths in a search tree, where each edge is
   // marked with some substring of the query tokens. These paths are
   // called "layer sequence" and current path is stored in |m_layers|.
-  void MatchPOIsAndBuildings(BaseContext & ctx, size_t curToken,
-                             CBV const & filter = CBV::GetFull());
+  void MatchPOIsAndBuildings(BaseContext & ctx, size_t curToken, CBV const & filter);
 
   // Returns true if current path in the search tree (see comment for
   // MatchPOIsAndBuildings()) looks sane. This method is used as a fast