diff --git a/generator/feature_builder.cpp b/generator/feature_builder.cpp
index a3ff4826f4..7e06547b74 100644
--- a/generator/feature_builder.cpp
+++ b/generator/feature_builder.cpp
@@ -183,13 +183,17 @@ bool FeatureBuilder1::PreSerialize()
     break;
 
   case GEOM_LINE:
+  {
+    static feature::TypeSetChecker checkHighway("highway");
+
     // We need refs for road's numbers.
-    if (!IsHighway(m_Params.m_Types))
+    if (!checkHighway.IsEqualV(m_Params.m_Types))
       m_Params.ref = string();
 
     m_Params.rank = 0;
     m_Params.house.Clear();
     break;
+  }
 
   case GEOM_AREA:
     m_Params.rank = 0;
diff --git a/generator/osm_element.hpp b/generator/osm_element.hpp
index 327da4ce2b..358a9f3589 100644
--- a/generator/osm_element.hpp
+++ b/generator/osm_element.hpp
@@ -416,11 +416,21 @@ protected:
           FeatureParams params(fValue);
           if (feature::RemoveNoDrawableTypes(params.m_Types, FEATURE_TYPE_POINT))
           {
-            feature_t f;
-            f.SetParams(params);
-            f.SetCenter(ft.GetGeometryCenter());
-            if (f.PreSerialize())
-              base_type::m_emitter(f);
+            // Remove all "place" types - they are duplicated in data.
+            typedef feature::TypeSetChecker ChekerT;
+            static ChekerT checkPlace("place");
+            params.m_Types.erase(remove_if(params.m_Types.begin(), params.m_Types.end(),
+                                           bind(&ChekerT::IsEqual, cref(checkPlace), _1)),
+                                 params.m_Types.end());
+
+            if (!params.m_Types.empty())
+            {
+              feature_t f;
+              f.SetParams(params);
+              f.SetCenter(ft.GetGeometryCenter());
+              if (f.PreSerialize())
+                base_type::m_emitter(f);
+            }
           }
         }
 
diff --git a/indexer/feature_visibility.cpp b/indexer/feature_visibility.cpp
index a32f9b13b9..5e88bb51cc 100644
--- a/indexer/feature_visibility.cpp
+++ b/indexer/feature_visibility.cpp
@@ -404,37 +404,6 @@ pair<int, int> GetDrawableScaleRangeForRules(FeatureBase const & f, int rules)
   return GetDrawableScaleRangeForRules(TypesHolder(f), rules);
 }
 
-bool IsHighway(vector<uint32_t> const & types)
-{
-  ClassifObject const * pRoot = classif().GetRoot();
-
-  for (size_t i = 0; i < types.size(); ++i)
-  {
-    uint8_t v;
-    CHECK(ftype::GetValue(types[i], 0, v), (types[i]));
-    {
-      if (pRoot->GetObject(v)->GetName() == "highway")
-        return true;
-    }
-  }
-
-  return false;
-}
-
-/*
-bool IsJunction(vector<uint32_t> const & types)
-{
-  char const * arr[] = { "highway", "motorway_junction" };
-  static const uint32_t type = classif().GetTypeByPath(vector<string>(arr, arr + 2));
-
-  for (size_t i = 0; i < types.size(); ++i)
-    if (types[i] == type)
-      return true;
-
-  return false;
-}
-*/
-
 bool UsePopulationRank(uint32_t type)
 {
   class CheckerT
@@ -471,4 +440,17 @@ bool UsePopulationRank(uint32_t type)
   return (checker.IsMyType(type));
 }
 
+
+void TypeSetChecker::SetType(StringT * beg, StringT * end)
+{
+  m_type = classif().GetTypeByPath(vector<string>(beg, end));
+  m_level = distance(beg, end);
+}
+
+bool TypeSetChecker::IsEqual(uint32_t type) const
+{
+  ftype::TruncValue(type, m_level);
+  return (m_type == type);
+}
+
 }
diff --git a/indexer/feature_visibility.hpp b/indexer/feature_visibility.hpp
index 65d28220e7..d5c1ca0586 100644
--- a/indexer/feature_visibility.hpp
+++ b/indexer/feature_visibility.hpp
@@ -57,9 +57,6 @@ namespace feature
   pair<int, bool> GetDrawRule(FeatureBase const & f, int level,
                               vector<drule::Key> & keys, string & names);
 
-  bool IsHighway(vector<uint32_t> const & types);
-  //bool IsJunction(vector<uint32_t> const & types);
-
   bool UsePopulationRank(uint32_t type);
 
   template <class IterT>
@@ -72,4 +69,36 @@ namespace feature
     }
     return false;
   }
+
+  /// Used to check whether user types belong to particular classificator set.
+  class TypeSetChecker
+  {
+    uint32_t m_type;
+    uint8_t m_level;
+
+    typedef char const * StringT;
+    void SetType(StringT * beg, StringT * end);
+
+  public:
+    /// Construct by classificator set name.
+    //@{
+    TypeSetChecker(StringT name) { SetType(&name, &name + 1); }
+    TypeSetChecker(StringT arr[], size_t n) { SetType(arr, arr + n); }
+    //@}
+
+    bool IsEqual(uint32_t type) const;
+    template <class IterT> bool IsEqualR(IterT beg, IterT end) const
+    {
+      while (beg != end)
+      {
+        if (IsEqual(*beg++))
+          return true;
+      }
+      return false;
+    }
+    bool IsEqualV(vector<uint32_t> const & v) const
+    {
+      return IsEqualR(v.begin(), v.end());
+    }
+  };
 }