diff --git a/indexer/classificator.cpp b/indexer/classificator.cpp
index ab8fbf27d9..6267b63c12 100644
--- a/indexer/classificator.cpp
+++ b/indexer/classificator.cpp
@@ -286,6 +286,11 @@ namespace ftype
       set_value(type, cl, 1);
     }
   }
+
+  uint8_t GetLevel(uint32_t type)
+  {
+    return get_control_level(type);
+  }
 }
 
 namespace
diff --git a/indexer/classificator.hpp b/indexer/classificator.hpp
index 43a4affdba..60913fb108 100644
--- a/indexer/classificator.hpp
+++ b/indexer/classificator.hpp
@@ -20,6 +20,7 @@ namespace ftype
   bool GetValue(uint32_t type, uint8_t level, uint8_t & value);
   void PopValue(uint32_t & type);
   void TruncValue(uint32_t & type, uint8_t level);
+  uint8_t GetLevel(uint32_t type);
 }
 
 class ClassifObjectPtr
diff --git a/map/address_finder.cpp b/map/address_finder.cpp
index ff939ecd95..1879997c11 100644
--- a/map/address_finder.cpp
+++ b/map/address_finder.cpp
@@ -340,17 +340,8 @@ namespace
       size_t const count = types.Size();
       for (size_t i = 0; i < count; ++i)
       {
-        uint32_t type = types[i];
-
         string s;
-        if (!eng->GetNameByType(type, lang, s))
-        {
-          // Try to use common type truncation if no match found.
-          ftype::TruncValue(type, 2);
-          (void)eng->GetNameByType(type, lang, s);
-        }
-
-        if (!s.empty())
+        if (eng->GetNameByType(types[i], lang, s))
           info.m_types.push_back(s);
       }
 
diff --git a/search/search_engine.cpp b/search/search_engine.cpp
index db6b7cff7f..5dfe0f4562 100644
--- a/search/search_engine.cpp
+++ b/search/search_engine.cpp
@@ -8,6 +8,7 @@
 #include "../indexer/search_string_utils.hpp"
 #include "../indexer/mercator.hpp"
 #include "../indexer/scales.hpp"
+#include "../indexer/classificator.hpp"
 
 #include "../platform/platform.hpp"
 
@@ -380,7 +381,14 @@ string Engine::GetCountryName(string const & id)
 
 bool Engine::GetNameByType(uint32_t type, int8_t lang, string & name) const
 {
-  return m_pData->m_categories.GetNameByType(type, lang, name);
+  uint8_t level = ftype::GetLevel(type);
+  while (level >= 2)
+  {
+    if (m_pData->m_categories.GetNameByType(type, lang, name))
+      return true;
+    ftype::TruncValue(type, --level);
+  }
+  return false;
 }
 
 m2::RectD Engine::GetCountryBounds(string const & file) const