diff --git a/search/geocoder.cpp b/search/geocoder.cpp
index 0e5660e4d3..2d076dbe50 100644
--- a/search/geocoder.cpp
+++ b/search/geocoder.cpp
@@ -461,10 +461,10 @@ Geocoder::MwmInfosWithType Geocoder::OrderCountries(bool inViewport,
 
   auto const getMwmType = [&](auto const & info) {
     MwmType mwmType;
-    mwmType.m_viewportIntersect = m_params.m_pivot.IsIntersect(info->m_bordersRect);
-    mwmType.m_userPosition = m_params.m_position &&
-                             info->m_bordersRect.IsPointInside(*m_params.m_position);
-    mwmType.m_matchedCity = mwmsWithCities.count(info->GetCountryName()) != 0;
+    mwmType.m_viewportIntersected = m_params.m_pivot.IsIntersect(info->m_bordersRect);
+    mwmType.m_containsUserPosition =
+        m_params.m_position && info->m_bordersRect.IsPointInside(*m_params.m_position);
+    mwmType.m_containsMatchedCity = mwmsWithCities.count(info->GetCountryName()) != 0;
     return mwmType;
   };
 
@@ -566,13 +566,14 @@ void Geocoder::GoImpl(vector<shared_ptr<MwmInfo>> const & infos, bool inViewport
 
     if (m_params.IsCategorialRequest())
     {
-      MatchCategories(ctx, mwmType.m_viewportIntersect /* aroundPivot */);
+      MatchCategories(ctx, mwmType.m_viewportIntersected /* aroundPivot */);
     }
     else
     {
       MatchRegions(ctx, Region::TYPE_COUNTRY);
 
-      if (mwmType.m_viewportIntersect || mwmType.m_userPosition || m_preRanker.NumSentResults() == 0)
+      if (mwmType.m_viewportIntersected || mwmType.m_containsUserPosition ||
+          m_preRanker.NumSentResults() == 0)
       {
         MatchAroundPivot(ctx);
       }
diff --git a/search/geocoder.hpp b/search/geocoder.hpp
index efddf3ca04..ce447e85ad 100644
--- a/search/geocoder.hpp
+++ b/search/geocoder.hpp
@@ -138,13 +138,13 @@ private:
   {
     bool IsFirstBatchMwm(bool inViewport) const {
       if (inViewport)
-        return m_viewportIntersect;
-      return m_viewportIntersect || m_userPosition || m_matchedCity;
+        return m_viewportIntersected;
+      return m_viewportIntersected || m_containsUserPosition || m_containsMatchedCity;
     }
 
-    bool m_viewportIntersect = false;
-    bool m_userPosition = false;
-    bool m_matchedCity = false;
+    bool m_viewportIntersected = false;
+    bool m_containsUserPosition = false;
+    bool m_containsMatchedCity = false;
   };
 
   struct MwmInfosWithType
@@ -285,11 +285,13 @@ private:
                                              Model::Type & type);
 
   // Reorders maps in a way that prefix consists of "best" maps to search and suffix consists of all
-  // other maps ordered by minimum distance from pivot. Returns number of maps in prefix.
+  // other maps ordered by minimum distance from pivot. Returns MwmInfosWithType structure which
+  // consists of vector of mwms with MwmType information and number of "best" maps to search.
   // For viewport mode prefix consists of maps intersecting with pivot ordered by distance from pivot
   // center.
-  // For non-viewport search mode prefix consists of maps intersecting with pivot, map with user location
-  // and maps with cities matched to the query, sorting prefers mwms that contain the user's position.
+  // For non-viewport search mode prefix consists of maps intersecting with pivot, map with user
+  // location and maps with cities matched to the query, sorting prefers mwms that contain the
+  // user's position.
   MwmInfosWithType OrderCountries(bool inViewport,
                                   std::vector<std::shared_ptr<MwmInfo>> const & infos);