diff --git a/data/minsk-pass.mwm b/data/minsk-pass.mwm
index 9c9b10ce17..30e79a818c 100644
Binary files a/data/minsk-pass.mwm and b/data/minsk-pass.mwm differ
diff --git a/indexer/feature.cpp b/indexer/feature.cpp
index 422bccf6c1..cef9d0db69 100644
--- a/indexer/feature.cpp
+++ b/indexer/feature.cpp
@@ -514,8 +514,7 @@ namespace
 
 string FeatureType::DebugString(int scale) const
 {
-  // force to load all geometry
-  (void)GetLimitRect(scale);
+  ParseAll(scale);
 
   string s = base_type::DebugString();
 
@@ -528,13 +527,23 @@ string FeatureType::DebugString(int scale) const
   return s;
 }
 
+bool FeatureType::IsEmptyGeometry(int scale) const
+{
+  ParseAll(scale);
+
+  switch (GetFeatureType())
+  {
+  case FEATURE_TYPE_AREA: return m_Triangles.empty();
+  case FEATURE_TYPE_LINE: return m_Geometry.empty();
+  default:
+    ASSERT ( Header() & HEADER_HAS_POINT, () );
+    return false;
+  }
+}
+
 m2::RectD FeatureType::GetLimitRect(int scale) const
 {
-  if (!m_bGeometryParsed)
-    ParseGeometry(scale);
-
-  if (!m_bTrianglesParsed)
-    ParseTriangles(scale);
+  ParseAll(scale);
 
   if (m_Triangles.empty() && m_Geometry.empty() && (Header() & HEADER_HAS_POINT) == 0)
   {
@@ -622,3 +631,12 @@ void FeatureType::ParseOffsets() const
 
   m_bOffsetsParsed = true;
 }
+
+void FeatureType::ParseAll(int scale) const
+{
+  if (!m_bGeometryParsed)
+    ParseGeometry(scale);
+
+  if (!m_bTrianglesParsed)
+    ParseTriangles(scale);
+}
diff --git a/indexer/feature.hpp b/indexer/feature.hpp
index 0da107213d..f8cb8522b6 100644
--- a/indexer/feature.hpp
+++ b/indexer/feature.hpp
@@ -169,8 +169,7 @@ public:
   {
     FEATURE_TYPE_POINT = 0,
     FEATURE_TYPE_LINE = 1,
-    FEATURE_TYPE_AREA = 2,
-    FEATURE_TYPE_UNKNOWN = 17
+    FEATURE_TYPE_AREA = 2
   };
 
   FeatureBase() : m_Offset(0) {}
@@ -330,6 +329,8 @@ public:
   //@{
   m2::RectD GetLimitRect(int scale) const;
 
+  bool IsEmptyGeometry(int scale) const;
+
   template <typename FunctorT>
   void ForEachPointRef(FunctorT & f, int scale) const
   {
@@ -338,6 +339,7 @@ public:
 
     if (m_Geometry.empty())
     {
+      CHECK ( Header() & HEADER_HAS_POINT, ("Call ForEachPoint for empty geometry") );
       f(CoordPointT(m_Center.x, m_Center.y));
     }
     else
@@ -383,6 +385,8 @@ private:
   void ParseGeometry(int scale) const;
   void ParseTriangles(int scale) const;
 
+  void ParseAll(int scale) const;
+
   mutable vector<m2::PointD> m_Geometry;
   mutable vector<m2::PointD> m_Triangles;
 
diff --git a/indexer/feature_visibility.cpp b/indexer/feature_visibility.cpp
index 95f3d75492..42a69629c1 100644
--- a/indexer/feature_visibility.cpp
+++ b/indexer/feature_visibility.cpp
@@ -115,11 +115,6 @@ namespace
 int GetDrawRule(FeatureBase const & f, int level, vector<drule::Key> & keys, string & names)
 {
   FeatureBase::FeatureType const geoType = f.GetFeatureType();
-  if (geoType == FeatureBase::FEATURE_TYPE_UNKNOWN)
-  {
-    ASSERT ( false, ("Logic Error! Unknown feature type.") );
-    return FeatureBase::FEATURE_TYPE_UNKNOWN;
-  }
 
   FeatureBase::GetTypesFn types;
   f.ForEachTypeRef(types);
diff --git a/indexer/scale_index_builder.hpp b/indexer/scale_index_builder.hpp
index dbaefc4840..367b5aac9c 100644
--- a/indexer/scale_index_builder.hpp
+++ b/indexer/scale_index_builder.hpp
@@ -75,8 +75,8 @@ public:
   template <class TFeature>
   bool FeatureShouldBeIndexed(TFeature const & f) const
   {
-    // Call this to force TFeature::ParseGeometry
-    f.GetLimitRect(m_ScaleRange.second);
+     if (f.IsEmptyGeometry(m_ScaleRange.second-1))
+       return false;
 
     uint32_t const minScale = feature::MinDrawableScaleForFeature(f);
     return (m_ScaleRange.first <= minScale && minScale < m_ScaleRange.second);
diff --git a/map/framework.cpp b/map/framework.cpp
index e8ac65f187..4d2d3bfde3 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -141,9 +141,6 @@ namespace fwork
     case FeatureBase::FEATURE_TYPE_LINE:
       GET_POINTS(filter_screenpts_adapter<path_points>, ForEachPointRef, assign_path)
       break;
-
-    case FeatureBase::FEATURE_TYPE_UNKNOWN:
-      ASSERT(0, ("Feature type is unknown"));
     }
 
     // nothing to draw
diff --git a/map/map_tests/map_foreach_test.cpp b/map/map_tests/map_foreach_test.cpp
index 6dfa8cf43e..177d02b6f8 100644
--- a/map/map_tests/map_foreach_test.cpp
+++ b/map/map_tests/map_foreach_test.cpp
@@ -38,7 +38,7 @@ protected:
     CHECK(m_dbgString == f.DebugString(m_scale), ());
 
     // Feature that hasn't any geometry for m_scale returns empty DebugString().
-    return (!m_dbgString.empty() && feature::IsDrawableForIndex(f, m_scale));
+    return (!f.IsEmptyGeometry(m_scale) && feature::IsDrawableForIndex(f, m_scale));
   }
 
   void add(FeatureType const & f) const