diff --git a/search/geocoder.cpp b/search/geocoder.cpp
index 8e187e7a2e..4748cbec80 100644
--- a/search/geocoder.cpp
+++ b/search/geocoder.cpp
@@ -943,7 +943,7 @@ void Geocoder::MatchCities(BaseContext & ctx)
         continue;
       }
 
-      ScopedMarkTokens mark(ctx.m_tokens, BaseContext::TOKEN_TYPE_CITY, tokenRange);
+      ScopedMarkTokens mark(ctx.m_tokens, BaseContext::FromModelType(city.m_type), tokenRange);
       ctx.m_city = &city;
       SCOPE_GUARD(cleanup, [&ctx]() { ctx.m_city = nullptr; });
 
@@ -1514,7 +1514,7 @@ void Geocoder::EmitResult(BaseContext & ctx, MwmSet::MwmId const & mwmId, uint32
   if (ctx.m_city)
   {
     auto const & city = *ctx.m_city;
-    info.m_tokenRanges[Model::TYPE_CITY] = city.m_tokenRange;
+    info.m_tokenRanges[city.m_type] = city.m_tokenRange;
     info.m_cityId = FeatureID(city.m_countryId, city.m_featureId);
   }
 
diff --git a/search/ranker.cpp b/search/ranker.cpp
index c7873a7b52..cce29f232c 100644
--- a/search/ranker.cpp
+++ b/search/ranker.cpp
@@ -355,6 +355,7 @@ class RankerResultMaker
     info.m_rating = preInfo.m_rating;
     info.m_type = preInfo.m_type;
     info.m_allTokensUsed = preInfo.m_allTokensUsed;
+    info.m_numTokens = m_params.GetNumTokens();
     info.m_exactMatch = preInfo.m_exactMatch;
     info.m_categorialRequest = m_params.IsCategorialRequest();
     info.m_tokenRanges = preInfo.m_tokenRanges;
@@ -430,7 +431,6 @@ class RankerResultMaker
 
       info.m_nameScore = nameScore;
       info.m_errorsMade = errorsMade;
-      info.m_numTokens = m_params.GetNumTokens();
       info.m_matchedFraction =
           totalLength == 0 ? 1.0
                            : static_cast<double>(matchedLength) / static_cast<double>(totalLength);