diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index e50a7b762..903d1c6d1 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1361,7 +1361,7 @@ historic|memorial|plaque;[historic=memorial][memorial=plaque],[historic=memorial
 historic|castle|defensive;[historic=castle][castle_type=defensive];;name;int_name;1234;
 historic|castle|stately;[historic=castle][castle_type=stately];;name;int_name;1235;
 attraction|animal;1236;
-disusedbusiness;[disused:shop?],[disused:amenity=restaurant],[disused:amenity=fast_food],[disused:amenity=cafe],[disused:amenity=pub],[disused:amenity=bar];;;;1237;
+disusedbusiness;[disused:shop?],[disused:amenity=restaurant],[disused:amenity=fast_food],[disused:amenity=cafe],[disused:amenity=pub],[disused:amenity=bar],[disused:amenity=ice_cream],[disused:amenity=pharmacy],[disused:amenity=post_office],[disused:amenity=bank],[disused:amenity=bureau_de_change],[disused:amenity=car_rental],[disused:amenity=motorcycle_rental],[disused:amenity=casino],[disused:amenity=gambling],[disused:amenity=internet_cafe],[disused:craft=confectionery],[disused:craft=electronics_repair],[disused:craft=shoemaker],[disused:craft=tailor],[disused:craft=key_cutter],[disused:craft=locksmith],[disused:office=estate_agent],[disused:office=insurance];;;;1237;
 cuisine|regional;1238;
 cuisine|pizza;1239;
 cuisine|burger;1240;
diff --git a/libs/indexer/editable_map_object.cpp b/libs/indexer/editable_map_object.cpp
index 90df34ca7..7bec87943 100644
--- a/libs/indexer/editable_map_object.cpp
+++ b/libs/indexer/editable_map_object.cpp
@@ -104,6 +104,24 @@ bool EditableMapObject::CanMarkPlaceAsDisused() const
       "amenity-cafe",
       "amenity-pub",
       "amenity-bar",
+      "amenity-ice_cream",
+      "amenity-pharmacy",
+      "amenity-post_office",
+      "amenity-bank",
+      "amenity-bureau_de_change",
+      "amenity-car_rental",
+      "amenity-motorcycle_rental",
+      "amenity-casino",
+      "amenity-gambling",
+      "amenity-internet_cafe",
+      "craft-confectionery",
+      "craft-electronics_repair",
+      "raft-shoemaker",
+      "craft-tailor",
+      "craft-key_cutter",
+      "craft-locksmith",
+      "office-estate_agent",
+      "office-insurance",
   };
 
   for (auto const & typePrefix : typePrefixes)