diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp
index 6a0ce1e34f..cd0705a968 100644
--- a/indexer/ftypes_matcher.cpp
+++ b/indexer/ftypes_matcher.cpp
@@ -443,8 +443,8 @@ OneLevelPOIChecker::OneLevelPOIChecker() : ftypes::BaseChecker(1 /* level */)
 {
   Classificator const & c = classif();
 
-  for (auto const * path : {"amenity",  "craft", "healthcare", "historic", "leisure", "office", "railway",
-                            "shop", "sport", "tourism", "mountain_pass"})
+  for (auto const * path : {"amenity", "craft", "emergency", "healthcare", "historic", "leisure",
+                            "mountain_pass", "office", "railway", "shop", "sport", "tourism"})
     m_types.push_back(c.GetTypeByPath({path}));
 }
 
@@ -466,6 +466,8 @@ TwoLevelPOIChecker::TwoLevelPOIChecker() : ftypes::BaseChecker(2 /* level */)
       {"highway", "rest_area"},
       {"highway", "services"},
       {"highway", "speed_camera"},
+      {"man_made", "communications_tower"},
+      {"man_made", "cross"},
       {"man_made", "lighthouse"},
       {"man_made", "water_tap"},
       {"man_made", "water_well"},