diff --git a/indexer/feature_data.cpp b/indexer/feature_data.cpp
index 67e43f3b42..dd897ce45b 100644
--- a/indexer/feature_data.cpp
+++ b/indexer/feature_data.cpp
@@ -88,6 +88,7 @@ public:
       { "hwtag" },
       { "psurface" },
       { "internet_access" },
+      { "wheelchair" },
     };
 
     AddTypes(arr1);
@@ -99,6 +100,7 @@ public:
       { "amenity", "bench" },
       { "amenity", "shelter" },
       { "building", "address" },
+      { "building", "has_parts" },
       { "sponsored", "booking" },
     };