Review fixes.

indexer/ftypes_matcher.hpp

@@ -86,9 +86,8 @@ public:
 
 class IsVillageChecker : public BaseChecker
 {
-public:
   IsVillageChecker();
-
+public:
   template <typename TFn>
   void ForEachType(TFn && fn) const
   {

search/v2/geocoder.cpp

@@ -523,7 +523,12 @@ void Geocoder::GoImpl(vector<shared_ptr<MwmInfo>> & infos, bool inViewport)
       m_streets = LoadStreets(*m_context);
       m_villages = LoadVillages(*m_context);
 
+      auto citiesFromWorld = m_cities;
       FillVillageLocalities();
+      MY_SCOPE_GUARD(remove_villages, [&]()
+      {
+         m_cities = citiesFromWorld;
+      });
 
       m_usedTokens.assign(m_numTokens, false);
       MatchRegions(REGION_TYPE_COUNTRY);
@@ -764,7 +769,7 @@ void Geocoder::FillVillageLocalities()
 
     switch (m_model.GetSearchType(ft))
     {
-    case SearchModel::SEARCH_TYPE_CITY:
+    case SearchModel::SEARCH_TYPE_VILLAGE:
     {
       if (numVillages < kMaxNumVillages && ft.GetFeatureType() == feature::GEOM_POINT)
       {

search/v2/search_model.cpp

@@ -89,8 +89,9 @@ SearchModel::SearchType SearchModel::GetSearchType(FeatureType const & feature)
       return SEARCH_TYPE_COUNTRY;
     case CITY:
     case TOWN:
-    case VILLAGE:
       return SEARCH_TYPE_CITY;
+    case VILLAGE:
+      return SEARCH_TYPE_VILLAGE;
     case LOCALITY_COUNT:
       return SEARCH_TYPE_COUNT;
     }

search/v2/search_model.hpp

@@ -27,6 +27,7 @@ public:
     SEARCH_TYPE_POI,
     SEARCH_TYPE_BUILDING,
     SEARCH_TYPE_STREET,
+    SEARCH_TYPE_VILLAGE,
     SEARCH_TYPE_CITY,
     SEARCH_TYPE_STATE, // US or Canadian states
     SEARCH_TYPE_COUNTRY,