diff --git a/data/categories.txt b/data/categories.txt
index a35a5d094..df315d246 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -19055,3 +19055,11 @@ uk:5Камера схову|4багаж
 vi:Tủ khóa hành lý
 zh-Hans:行李寄存柜
 zh-Hant:行李寄存櫃
+
+office-security
+en:4Security Office
+ru:ЧОП|4Охрана
+
+building-guardhouse
+en:4Guard
+ru:4Сторож|4Охрана
diff --git a/data/editor.config b/data/editor.config
index 3415d1136..f4be95219 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -462,6 +462,9 @@
         <include group="poi" />
         <include field="operator" />
       </type>
+      <type id="building-guardhouse">
+        <include group="poi" />
+      </type>
       <!-- Too generic to be added -->
       <type id="craft" can_add="no">
         <include group="poi_internet" />
@@ -702,6 +705,9 @@
       <type id="office-ngo" group="office">
         <include group="poi_internet" />
       </type>
+      <type id="office-security" group="office">
+        <include group="poi_internet" />
+      </type>
       <type id="office-telecommunication" group="office">
         <include group="poi_internet" />
       </type>
diff --git a/libs/indexer/ftypes_matcher.cpp b/libs/indexer/ftypes_matcher.cpp
index 256d70cd4..5cced2376 100644
--- a/libs/indexer/ftypes_matcher.cpp
+++ b/libs/indexer/ftypes_matcher.cpp
@@ -459,19 +459,33 @@ OneLevelPOIChecker::OneLevelPOIChecker() : ftypes::BaseChecker(1 /* level */)
 TwoLevelPOIChecker::TwoLevelPOIChecker() : ftypes::BaseChecker(2 /* level */)
 {
   Classificator const & c = classif();
-  base::StringIL arr[] = {{"aeroway", "terminal"},       {"aeroway", "gate"},
-                          {"building", "train_station"}, {"emergency", "defibrillator"},
-                          {"emergency", "fire_hydrant"}, {"emergency", "phone"},
-                          {"highway", "bus_stop"},       {"highway", "elevator"},
-                          {"highway", "ford"},           {"highway", "raceway"},
-                          {"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"},
-                          {"natural", "beach"},          {"natural", "cave_entrance"},
-                          {"natural", "geyser"},         {"natural", "hot_spring"},
-                          {"natural", "peak"},           {"natural", "saddle"},
-                          {"natural", "spring"},         {"natural", "volcano"},
+  base::StringIL arr[] = {{"aeroway", "terminal"},
+                          {"aeroway", "gate"},
+                          {"building", "guardhouse"},
+                          {"building", "train_station"},
+                          {"emergency", "defibrillator"},
+                          {"emergency", "fire_hydrant"},
+                          {"emergency", "phone"},
+                          {"highway", "bus_stop"},
+                          {"highway", "elevator"},
+                          {"highway", "ford"},
+                          {"highway", "raceway"},
+                          {"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"},
+                          {"natural", "beach"},
+                          {"natural", "cave_entrance"},
+                          {"natural", "geyser"},
+                          {"natural", "hot_spring"},
+                          {"natural", "peak"},
+                          {"natural", "saddle"},
+                          {"natural", "spring"},
+                          {"natural", "volcano"},
                           {"waterway", "waterfall"}};
 
   for (auto const & path : arr)