diff --git a/data/categories.txt b/data/categories.txt
index 63032a6882..912883d112 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -9440,3 +9440,7 @@ vi:Sông băng
 zh-Hans:冰川
 zh-Hant:冰川
 fa:یخچال طبیعی
+
+highway-ford
+en:Ford
+ru:Брод
diff --git a/search/model.cpp b/search/model.cpp
index 5476c3b14b..2ad8be3212 100644
--- a/search/model.cpp
+++ b/search/model.cpp
@@ -13,12 +13,16 @@ namespace search
 TwoLevelPOIChecker::TwoLevelPOIChecker() : ftypes::BaseChecker(2 /* level */)
 {
   Classificator const & c = classif();
-  base::StringIL arr[] = {{"highway", "bus_stop"},
+  base::StringIL arr[] = {{"building", "train_station"},
+                          {"highway", "bus_stop"},
+                          {"highway", "ford"},
                           {"highway", "speed_camera"},
                           {"waterway", "waterfall"},
                           {"natural", "volcano"},
                           {"natural", "cave_entrance"},
                           {"natural", "beach"},
+                          {"natural", "spring"},
+                          {"natural", "geyser"},
                           {"emergency", "defibrillator"},
                           {"emergency", "fire_hydrant"}};