diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp
index 82f098ab7b..f355553812 100644
--- a/indexer/osm_editor.cpp
+++ b/indexer/osm_editor.cpp
@@ -87,12 +87,12 @@ static unordered_map<string, TypeDescription> const gEditableTypes = {
   {"amenity-bar", {{EType::FMD_CUISINE, EType::FMD_INTERNET}, true, true}},
   {"amenity-bicycle_rental", {{EType::FMD_OPERATOR}, true, false}},
   {"amenity-bureau_de_change", {{EType::FMD_OPERATOR}, true, true}},
-  {"amenity-bus_station", {{EType::FMD_OPERATOR}, true, true}},
+  {"amenity-bus_station", {{EType::FMD_OPERATOR, EType::FMD_INTERNET}, true, true}},
   {"amenity-cafe", {{EType::FMD_CUISINE, EType::FMD_OPERATOR, EType::FMD_INTERNET}, true, true}},
   {"amenity-car_rental", {{EType::FMD_OPERATOR, EType::FMD_INTERNET}, true, true}},
   {"amenity-car_sharing", {{EType::FMD_OPERATOR, EType::FMD_WEBSITE}, true, false}},
   {"amenity-casino", {{EType::FMD_OPERATOR, EType::FMD_INTERNET}, true, true}},
-  {"amenity-cinema", {{EType::FMD_OPERATOR}, true, true}},
+  {"amenity-cinema", {{EType::FMD_OPERATOR, EType::FMD_INTERNET}, true, true}},
   {"amenity-college", {{EType::FMD_OPERATOR}, true, true}},
   {"amenity-doctors", {{EType::FMD_INTERNET}, true, true}},
   {"amenity-drinking_water", {{}, true, false}},
@@ -116,7 +116,7 @@ static unordered_map<string, TypeDescription> const gEditableTypes = {
   {"amenity-post_box", {{EType::FMD_OPERATOR, EType::FMD_POSTCODE}, true, false}},
   {"amenity-post_office", {{EType::FMD_OPERATOR, EType::FMD_POSTCODE, EType::FMD_INTERNET}, true, true}},
   {"amenity-pub", {{EType::FMD_OPERATOR, EType::FMD_CUISINE, EType::FMD_INTERNET}, true, true}},
-  {"amenity-recycling", {{EType::FMD_OPERATOR}, true, false}},
+  {"amenity-recycling", {{EType::FMD_OPERATOR, EType::FMD_WEBSITE, EType::FMD_PHONE_NUMBER}, true, false}},
   {"amenity-restaurant", {{EType::FMD_OPERATOR, EType::FMD_CUISINE, EType::FMD_INTERNET}, true, true}},
   {"amenity-school", {{EType::FMD_OPERATOR}, true, true}},
   {"amenity-taxi", {{EType::FMD_OPERATOR}, true, false}},
@@ -125,7 +125,7 @@ static unordered_map<string, TypeDescription> const gEditableTypes = {
   {"amenity-toilets", {{EType::FMD_OPERATOR, EType::FMD_OPEN_HOURS}, true, false}},
   {"amenity-townhall", {{}, true, true}},
   {"amenity-university", {{}, true, true}},
-  {"amenity-waste_disposal", {{EType::FMD_OPERATOR, EType::FMD_WEBSITE}, false, false}},
+  {"amenity-waste_disposal", {{EType::FMD_OPERATOR}, false, false}},
   {"highway-bus_stop", {{EType::FMD_OPERATOR}, true, false}},
   {"historic-archaeological_site", {{EType::FMD_WIKIPEDIA}, true, false}},
   {"historic-castle", {{EType::FMD_WIKIPEDIA}, true, false}},