Update to iD v1.8.5

[rails.git] / vendor / assets / iD / presets.js

diff --git a/vendor/assets/iD/presets.js b/vendor/assets/iD/presets.js
index 5b3c02589e4b5cc5ec66e01aba1c44eb8c6c2a82..df4344c3ffec6dd3efbbe5fcf0f91d149e99488d 100644 (file)
--- a/vendor/assets/iD/presets.js
+++ b/vendor/assets/iD/presets.js
@@ -32,6 +32,7 @@ iD.data.presets = {
                 "funifor",
                 "funitel"
             ],
+            "searchable": false,
             "name": "Aerialway"
         },
         "aerialway/cable_car": {
@@ -188,6 +189,7 @@ iD.data.presets = {
             "tags": {
                 "aeroway": "*"
             },
+            "searchable": false,
             "name": "Aeroway"
         },
         "aeroway/aerodrome": {
@@ -355,7 +357,8 @@ iD.data.presets = {
         "amenity/atm": {
             "icon": "bank",
             "fields": [
-                "operator"
+                "operator",
+                "drive_through"
             ],
             "geometry": [
                 "point",
@@ -378,7 +381,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "geometry": [
                 "point",
@@ -453,6 +457,9 @@ iD.data.presets = {
                 "vertex",
                 "line"
             ],
+            "terms": [
+                "seat"
+            ],
             "tags": {
                 "amenity": "bench"
             },
@@ -507,7 +514,7 @@ iD.data.presets = {
                 "brand",
                 "opening_hours",
                 "fee",
-                "service/bicycle/chaintool",
+                "service/bicycle/chain_tool",
                 "service/bicycle/pump"
             ],
             "geometry": [
@@ -516,12 +523,37 @@ iD.data.presets = {
                 "area"
             ],
             "terms": [
-                "bike"
+                "bike",
+                "repair",
+                "chain",
+                "pump"
             ],
             "tags": {
                 "amenity": "bicycle_repair_station"
             },
-            "name": "Bicycle Repair Station"
+            "name": "Bicycle Repair Tool Stand"
+        },
+        "amenity/biergarten": {
+            "icon": "beer",
+            "fields": [
+                "address",
+                "building_area",
+                "opening_hours",
+                "smoking"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "amenity": "biergarten"
+            },
+            "terms": [
+                "beer",
+                "bier",
+                "booze"
+            ],
+            "name": "Beer Garden"
         },
         "amenity/boat_rental": {
             "fields": [
@@ -584,6 +616,7 @@ iD.data.presets = {
                 "area"
             ],
             "terms": [
+                "bistro",
                 "coffee",
                 "tea"
             ],
@@ -637,6 +670,30 @@ iD.data.presets = {
             },
             "name": "Car Wash"
         },
+        "amenity/casino": {
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours",
+                "smoking"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "gambling",
+                "roulette",
+                "craps",
+                "poker",
+                "blackjack"
+            ],
+            "tags": {
+                "amenity": "casino"
+            },
+            "name": "Casino"
+        },
         "amenity/charging_station": {
             "icon": "car",
             "fields": [
@@ -800,7 +857,7 @@ iD.data.presets = {
             "name": "Courthouse"
         },
         "amenity/dentist": {
-            "icon": "hospital",
+            "icon": "dentist",
             "fields": [
                 "address",
                 "building_area",
@@ -819,7 +876,7 @@ iD.data.presets = {
             },
             "name": "Dentist"
         },
-        "amenity/doctor": {
+        "amenity/doctors": {
             "icon": "hospital",
             "fields": [
                 "address",
@@ -899,6 +956,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "geometry": [
@@ -913,6 +971,25 @@ iD.data.presets = {
             ],
             "name": "Fast Food"
         },
+        "amenity/ferry_terminal": {
+            "icon": "ferry",
+            "fields": [
+                "network",
+                "operator",
+                "address",
+                "building_area"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "amenity": "ferry_terminal"
+            },
+            "name": "Ferry Terminal"
+        },
         "amenity/fire_station": {
             "icon": "fire-station",
             "fields": [
@@ -945,7 +1022,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "geometry": [
@@ -955,6 +1031,7 @@ iD.data.presets = {
             "terms": [
                 "petrol",
                 "fuel",
+                "gasoline",
                 "propane",
                 "diesel",
                 "lng",
@@ -1029,6 +1106,18 @@ iD.data.presets = {
             },
             "name": "Hospital Grounds"
         },
+        "amenity/hunting_stand": {
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "amenity": "hunting_stand"
+            },
+            "name": "Hunting Stand"
+        },
         "amenity/kindergarten": {
             "icon": "school",
             "fields": [
@@ -1084,6 +1173,24 @@ iD.data.presets = {
             },
             "name": "Marketplace"
         },
+        "amenity/motorcycle_parking": {
+            "icon": "scooter",
+            "fields": [
+                "capacity",
+                "operator",
+                "covered",
+                "access_simple"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "amenity": "motorcycle_parking"
+            },
+            "name": "Motorcycle Parking"
+        },
         "amenity/nightclub": {
             "icon": "bar",
             "fields": [
@@ -1118,6 +1225,8 @@ iD.data.presets = {
                 "access_simple",
                 "supervised",
                 "park_ride",
+                "surface",
+                "maxstay",
                 "address"
             ],
             "geometry": [
@@ -1145,13 +1254,29 @@ iD.data.presets = {
             },
             "name": "Parking Garage Entrance/Exit"
         },
+        "amenity/parking_space": {
+            "fields": [
+                "capacity"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "amenity": "parking_space"
+            },
+            "name": "Parking Space"
+        },
         "amenity/pharmacy": {
             "icon": "pharmacy",
             "fields": [
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "geometry": [
                 "point",
@@ -1346,7 +1471,8 @@ iD.data.presets = {
             "icon": "post",
             "fields": [
                 "operator",
-                "collection_times"
+                "collection_times",
+                "drive_through"
             ],
             "geometry": [
                 "point",
@@ -1452,13 +1578,16 @@ iD.data.presets = {
             "name": "Ranger Station"
         },
         "amenity/recycling": {
-            "icon": "recycling",
+            "icon": "waste-basket",
             "fields": [
                 "operator",
                 "address",
+                "recycling/type",
                 "recycling/cans",
-                "recycling/glass",
+                "recycling/glass_bottles",
                 "recycling/paper",
+                "recycling/glass",
+                "recycling/plastic",
                 "recycling/clothes"
             ],
             "geometry": [
@@ -1532,6 +1661,33 @@ iD.data.presets = {
             },
             "name": "Restaurant"
         },
+        "amenity/sanitary_dump_station": {
+            "fields": [
+                "operator",
+                "access_toilets",
+                "fee",
+                "water_point"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [
+                "Motor Home",
+                "Camper",
+                "Sanitary",
+                "Dump Station",
+                "Elsan",
+                "CDP",
+                "CTDP",
+                "Chemical Toilet"
+            ],
+            "tags": {
+                "amenity": "sanitary_dump_station"
+            },
+            "name": "RV Toilet Disposal"
+        },
         "amenity/school": {
             "icon": "school",
             "fields": [
@@ -1756,7 +1912,9 @@ iD.data.presets = {
                 "operator",
                 "building_area",
                 "access_toilets",
-                "gender"
+                "gender",
+                "fee",
+                "diaper"
             ],
             "geometry": [
                 "point",
@@ -1821,19 +1979,179 @@ iD.data.presets = {
             },
             "name": "University Grounds"
         },
-        "amenity/vending_machine": {
+        "amenity/vending_machine/cigarettes": {
+            "fields": [
+                "operator"
+            ],
+            "geometry": [
+                "point"
+            ],
+            "terms": [
+                "cigarette"
+            ],
+            "tags": {
+                "amenity": "vending_machine",
+                "vending": "cigarettes"
+            },
+            "name": "Cigarette Vending Machine"
+        },
+        "amenity/vending_machine/condoms": {
+            "fields": [
+                "operator"
+            ],
+            "geometry": [
+                "point"
+            ],
+            "terms": [
+                "condom"
+            ],
+            "tags": {
+                "amenity": "vending_machine",
+                "vending": "condoms"
+            },
+            "name": "Condom Vending Machine"
+        },
+        "amenity/vending_machine/drinks": {
             "fields": [
-                "vending",
                 "operator"
             ],
             "geometry": [
                 "point"
             ],
             "terms": [
-                "snack",
+                "drink",
                 "soda",
+                "beverage",
+                "juice",
+                "pop"
+            ],
+            "tags": {
+                "amenity": "vending_machine",
+                "vending": "drinks"
+            },
+            "name": "Drink Vending Machine"
+        },
+        "amenity/vending_machine/excrement_bags": {
+            "fields": [
+                "operator"
+            ],
+            "geometry": [
+                "point"
+            ],
+            "terms": [
+                "excrement bags",
+                "poop",
+                "dog",
+                "animal"
+            ],
+            "tags": {
+                "amenity": "vending_machine",
+                "vending": "excrement_bags"
+            },
+            "name": "Excrement Bag Vending Machine"
+        },
+        "amenity/vending_machine/news_papers": {
+            "fields": [
+                "operator"
+            ],
+            "geometry": [
+                "point"
+            ],
+            "terms": [
+                "newspaper"
+            ],
+            "tags": {
+                "amenity": "vending_machine",
+                "vending": "news_papers"
+            },
+            "name": "Newspaper Vending Machine"
+        },
+        "amenity/vending_machine/parcel_pickup_dropoff": {
+            "fields": [
+                "operator"
+            ],
+            "geometry": [
+                "point"
+            ],
+            "terms": [
+                "parcel",
+                "mail",
+                "pickup"
+            ],
+            "tags": {
+                "amenity": "vending_machine",
+                "vending": "parcel_pickup;parcel_mail_in"
+            },
+            "name": "Parcel Pickup/Dropoff Vending Machine"
+        },
+        "amenity/vending_machine/parking_tickets": {
+            "fields": [
+                "operator"
+            ],
+            "geometry": [
+                "point"
+            ],
+            "terms": [
+                "parking",
                 "ticket"
             ],
+            "tags": {
+                "amenity": "vending_machine",
+                "vending": "parking_tickets"
+            },
+            "name": "Parking Ticket Vending Machine"
+        },
+        "amenity/vending_machine/public_transport_tickets": {
+            "fields": [
+                "operator"
+            ],
+            "geometry": [
+                "point"
+            ],
+            "terms": [
+                "bus",
+                "train",
+                "ferry",
+                "rail",
+                "ticket",
+                "transportation"
+            ],
+            "tags": {
+                "amenity": "vending_machine",
+                "vending": "public_transport_tickets"
+            },
+            "name": "Transit Ticket Vending Machine"
+        },
+        "amenity/vending_machine/sweets": {
+            "fields": [
+                "operator"
+            ],
+            "geometry": [
+                "point"
+            ],
+            "terms": [
+                "candy",
+                "gum",
+                "chip",
+                "pretzel",
+                "cookie",
+                "cracker"
+            ],
+            "tags": {
+                "amenity": "vending_machine",
+                "vending": "sweets"
+            },
+            "name": "Snack Vending Machine"
+        },
+        "amenity/vending_machine/vending_machine": {
+            "fields": [
+                "vending",
+                "operator"
+            ],
+            "geometry": [
+                "point"
+            ],
+            "terms": [],
             "tags": {
                 "amenity": "vending_machine"
             },
@@ -1872,6 +2190,7 @@ iD.data.presets = {
                 "amenity": "waste_basket"
             },
             "terms": [
+                "bin",
                 "rubbish",
                 "litter",
                 "trash",
@@ -1879,6 +2198,34 @@ iD.data.presets = {
             ],
             "name": "Waste Basket"
         },
+        "amenity/waste_disposal": {
+            "icon": "waste-basket",
+            "geometry": [
+                "point",
+                "vertex"
+            ],
+            "tags": {
+                "amenity": "waste_disposal"
+            },
+            "terms": [
+                "rubbish",
+                "litter",
+                "trash"
+            ],
+            "name": "Garbage Dumpster"
+        },
+        "amenity/water_point": {
+            "icon": "water",
+            "geometry": [
+                "area",
+                "vertex",
+                "point"
+            ],
+            "tags": {
+                "amenity": "water_point"
+            },
+            "name": "RV Drinking Water"
+        },
         "area": {
             "name": "Area",
             "tags": {
@@ -1889,6 +2236,18 @@ iD.data.presets = {
             ],
             "matchScore": 0.1
         },
+        "area/highway": {
+            "fields": [
+                "area/highway"
+            ],
+            "geometry": [
+                "area"
+            ],
+            "tags": {
+                "area:highway": "*"
+            },
+            "name": "Road Surface"
+        },
         "barrier": {
             "geometry": [
                 "point",
@@ -2106,11 +2465,13 @@ iD.data.presets = {
                 "address"
             ],
             "geometry": [
+                "point",
                 "area"
             ],
             "tags": {
                 "building": "*"
             },
+            "matchScore": 0.4,
             "terms": [],
             "name": "Building"
         },
@@ -2121,12 +2482,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "apartments"
             },
+            "matchScore": 0.5,
             "name": "Apartments"
         },
         "building/barn": {
@@ -2136,12 +2497,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "barn"
             },
+            "matchScore": 0.5,
             "name": "Barn"
         },
         "building/bunker": {
@@ -2150,12 +2511,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "bunker"
             },
+            "matchScore": 0.5,
             "name": "Bunker",
             "searchable": false
         },
@@ -2166,12 +2527,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "cabin"
             },
+            "matchScore": 0.5,
             "name": "Cabin"
         },
         "building/cathedral": {
@@ -2181,13 +2542,13 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "cathedral"
             },
-            "name": "Cathedral"
+            "matchScore": 0.5,
+            "name": "Cathedral Building"
         },
         "building/chapel": {
             "icon": "place-of-worship",
@@ -2196,13 +2557,13 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "chapel"
             },
-            "name": "Chapel"
+            "matchScore": 0.5,
+            "name": "Chapel Building"
         },
         "building/church": {
             "icon": "place-of-worship",
@@ -2211,13 +2572,13 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "church"
             },
-            "name": "Church"
+            "matchScore": 0.5,
+            "name": "Church Building"
         },
         "building/college": {
             "icon": "building",
@@ -2226,7 +2587,6 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "terms": [
@@ -2235,6 +2595,7 @@ iD.data.presets = {
             "tags": {
                 "building": "college"
             },
+            "matchScore": 0.5,
             "name": "College Building"
         },
         "building/commercial": {
@@ -2245,12 +2606,12 @@ iD.data.presets = {
                 "smoking"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "commercial"
             },
+            "matchScore": 0.5,
             "name": "Commercial Building"
         },
         "building/construction": {
@@ -2260,12 +2621,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "construction"
             },
+            "matchScore": 0.5,
             "name": "Building Under Construction"
         },
         "building/detached": {
@@ -2275,13 +2636,20 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "detached"
             },
-            "name": "Detached Home"
+            "terms": [
+                "home",
+                "single",
+                "family",
+                "residence",
+                "dwelling"
+            ],
+            "matchScore": 0.5,
+            "name": "Detached House"
         },
         "building/dormitory": {
             "icon": "building",
@@ -2291,12 +2659,12 @@ iD.data.presets = {
                 "smoking"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "dormitory"
             },
+            "matchScore": 0.5,
             "name": "Dormitory"
         },
         "building/entrance": {
@@ -2311,18 +2679,18 @@ iD.data.presets = {
             "searchable": false
         },
         "building/garage": {
+            "icon": "warehouse",
             "fields": [
                 "capacity"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "garage"
             },
-            "name": "Garage",
-            "icon": "warehouse"
+            "matchScore": 0.5,
+            "name": "Garage"
         },
         "building/garages": {
             "icon": "warehouse",
@@ -2330,12 +2698,12 @@ iD.data.presets = {
                 "capacity"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "garages"
             },
+            "matchScore": 0.5,
             "name": "Garages"
         },
         "building/greenhouse": {
@@ -2345,12 +2713,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "greenhouse"
             },
+            "matchScore": 0.5,
             "name": "Greenhouse"
         },
         "building/hospital": {
@@ -2360,12 +2728,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "hospital"
             },
+            "matchScore": 0.5,
             "name": "Hospital Building"
         },
         "building/hotel": {
@@ -2376,12 +2744,12 @@ iD.data.presets = {
                 "smoking"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "hotel"
             },
+            "matchScore": 0.5,
             "name": "Hotel Building"
         },
         "building/house": {
@@ -2391,22 +2759,28 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "house"
             },
+            "terms": [
+                "home",
+                "family",
+                "residence",
+                "dwelling"
+            ],
+            "matchScore": 0.5,
             "name": "House"
         },
         "building/hut": {
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "hut"
             },
+            "matchScore": 0.5,
             "name": "Hut"
         },
         "building/industrial": {
@@ -2416,12 +2790,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "industrial"
             },
+            "matchScore": 0.5,
             "name": "Industrial Building"
         },
         "building/kindergarten": {
@@ -2431,7 +2805,6 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "terms": [
@@ -2441,6 +2814,7 @@ iD.data.presets = {
             "tags": {
                 "building": "kindergarten"
             },
+            "matchScore": 0.5,
             "name": "Preschool/Kindergarten Building"
         },
         "building/public": {
@@ -2451,12 +2825,12 @@ iD.data.presets = {
                 "smoking"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "public"
             },
+            "matchScore": 0.5,
             "name": "Public Building"
         },
         "building/residential": {
@@ -2466,12 +2840,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "residential"
             },
+            "matchScore": 0.5,
             "name": "Residential Building"
         },
         "building/retail": {
@@ -2482,12 +2856,12 @@ iD.data.presets = {
                 "smoking"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "retail"
             },
+            "matchScore": 0.5,
             "name": "Retail Building"
         },
         "building/roof": {
@@ -2496,12 +2870,12 @@ iD.data.presets = {
                 "address"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "roof"
             },
+            "matchScore": 0.5,
             "name": "Roof"
         },
         "building/school": {
@@ -2511,7 +2885,6 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "terms": [
@@ -2523,8 +2896,33 @@ iD.data.presets = {
             "tags": {
                 "building": "school"
             },
+            "matchScore": 0.5,
             "name": "School Building"
         },
+        "building/semidetached_house": {
+            "icon": "building",
+            "fields": [
+                "address",
+                "levels"
+            ],
+            "geometry": [
+                "area"
+            ],
+            "tags": {
+                "building": "semidetached_house"
+            },
+            "terms": [
+                "home",
+                "double",
+                "duplex",
+                "twin",
+                "family",
+                "residence",
+                "dwelling"
+            ],
+            "matchScore": 0.5,
+            "name": "Semi-Detached House"
+        },
         "building/shed": {
             "icon": "building",
             "fields": [
@@ -2532,12 +2930,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "shed"
             },
+            "matchScore": 0.5,
             "name": "Shed"
         },
         "building/stable": {
@@ -2547,12 +2945,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "stable"
             },
+            "matchScore": 0.5,
             "name": "Stable"
         },
         "building/static_caravan": {
@@ -2562,12 +2960,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "static_caravan"
             },
+            "matchScore": 0.5,
             "name": "Static Mobile Home"
         },
         "building/terrace": {
@@ -2577,12 +2975,20 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "terrace"
             },
+            "terms": [
+                "home",
+                "terrace",
+                "brownstone",
+                "family",
+                "residence",
+                "dwelling"
+            ],
+            "matchScore": 0.5,
             "name": "Row Houses"
         },
         "building/train_station": {
@@ -2599,6 +3005,7 @@ iD.data.presets = {
             "tags": {
                 "building": "train_station"
             },
+            "matchScore": 0.5,
             "name": "Train Station",
             "searchable": false
         },
@@ -2609,7 +3016,6 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "terms": [
@@ -2618,21 +3024,22 @@ iD.data.presets = {
             "tags": {
                 "building": "university"
             },
+            "matchScore": 0.5,
             "name": "University Building"
         },
         "building/warehouse": {
-            "icon": "building",
+            "icon": "warehouse",
             "fields": [
                 "address",
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "warehouse"
             },
+            "matchScore": 0.5,
             "name": "Warehouse"
         },
         "craft": {
@@ -3590,9 +3997,10 @@ iD.data.presets = {
                 "footway": "crossing"
             },
             "terms": [],
-            "name": "Crossing"
+            "name": "Street Crossing"
         },
         "footway/crosswalk": {
+            "icon": "highway-footway",
             "fields": [
                 "crossing",
                 "access",
@@ -3611,9 +4019,10 @@ iD.data.presets = {
             "terms": [
                 "zebra crossing"
             ],
-            "name": "Crosswalk"
+            "name": "Pedestrian Crosswalk"
         },
         "footway/sidewalk": {
+            "icon": "highway-footway",
             "fields": [
                 "surface",
                 "lit",
@@ -3756,6 +4165,7 @@ iD.data.presets = {
             "tags": {
                 "highway": "*"
             },
+            "searchable": false,
             "name": "Highway"
         },
         "highway/bridleway": {
@@ -3782,6 +4192,7 @@ iD.data.presets = {
         "highway/bus_stop": {
             "icon": "bus",
             "fields": [
+                "network",
                 "operator",
                 "bench",
                 "shelter",
@@ -3797,6 +4208,29 @@ iD.data.presets = {
             "terms": [],
             "name": "Bus Stop"
         },
+        "highway/corridor": {
+            "icon": "highway-footway",
+            "fields": [
+                "width",
+                "level",
+                "access_simple"
+            ],
+            "geometry": [
+                "line"
+            ],
+            "tags": {
+                "highway": "corridor"
+            },
+            "terms": [
+                "gallery",
+                "hall",
+                "hallway",
+                "indoor",
+                "passage",
+                "passageway"
+            ],
+            "name": "Indoor Corridor"
+        },
         "highway/crossing": {
             "fields": [
                 "crossing",
@@ -3810,7 +4244,7 @@ iD.data.presets = {
                 "highway": "crossing"
             },
             "terms": [],
-            "name": "Crossing"
+            "name": "Street Crossing"
         },
         "highway/crosswalk": {
             "fields": [
@@ -3828,7 +4262,7 @@ iD.data.presets = {
             "terms": [
                 "zebra crossing"
             ],
-            "name": "Crosswalk"
+            "name": "Pedestrian Crosswalk"
         },
         "highway/cycleway": {
             "icon": "highway-cycleway",
@@ -3883,7 +4317,8 @@ iD.data.presets = {
                 "maxspeed",
                 "structure",
                 "access",
-                "surface"
+                "surface",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -3953,6 +4388,14 @@ iD.data.presets = {
             "tags": {
                 "highway": "motorway_link"
             },
+            "addTags": {
+                "highway": "motorway_link",
+                "oneway": "yes"
+            },
+            "removeTags": {
+                "highway": "motorway_link",
+                "oneway": "yes"
+            },
             "terms": [
                 "ramp",
                 "on ramp",
@@ -3991,6 +4434,7 @@ iD.data.presets = {
             "name": "Path"
         },
         "highway/pedestrian": {
+            "icon": "highway-footway",
             "fields": [
                 "surface",
                 "lit",
@@ -4007,7 +4451,7 @@ iD.data.presets = {
                 "highway": "pedestrian"
             },
             "terms": [],
-            "name": "Pedestrian"
+            "name": "Pedestrian Street"
         },
         "highway/primary": {
             "icon": "highway-primary",
@@ -4018,7 +4462,8 @@ iD.data.presets = {
                 "access",
                 "lanes",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4037,7 +4482,8 @@ iD.data.presets = {
                 "structure",
                 "access",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4084,7 +4530,8 @@ iD.data.presets = {
                 "maxspeed",
                 "structure",
                 "access",
-                "surface"
+                "surface",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4136,7 +4583,8 @@ iD.data.presets = {
                 "access",
                 "lanes",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4155,7 +4603,8 @@ iD.data.presets = {
                 "structure",
                 "access",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4178,7 +4627,8 @@ iD.data.presets = {
                 "maxspeed",
                 "structure",
                 "access",
-                "surface"
+                "surface",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4290,7 +4740,8 @@ iD.data.presets = {
                 "surface",
                 "lit",
                 "width",
-                "access"
+                "incline_steps",
+                "handrail"
             ],
             "icon": "highway-steps",
             "geometry": [
@@ -4347,7 +4798,8 @@ iD.data.presets = {
                 "access",
                 "lanes",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4366,7 +4818,8 @@ iD.data.presets = {
                 "structure",
                 "access",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4414,6 +4867,9 @@ iD.data.presets = {
             "tags": {
                 "highway": "traffic_signals"
             },
+            "fields": [
+                "traffic_signals"
+            ],
             "terms": [
                 "light",
                 "stoplight",
@@ -4484,7 +4940,8 @@ iD.data.presets = {
                 "maxspeed",
                 "structure",
                 "access",
-                "surface"
+                "surface",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4612,14 +5069,12 @@ iD.data.presets = {
                 "landuse"
             ],
             "geometry": [
-                "point",
-                "vertex",
                 "area"
             ],
             "tags": {
                 "landuse": "*"
             },
-            "name": "Landuse"
+            "name": "Land Use"
         },
         "landuse/allotments": {
             "geometry": [
@@ -4628,8 +5083,11 @@ iD.data.presets = {
             "tags": {
                 "landuse": "allotments"
             },
-            "terms": [],
-            "name": "Allotments"
+            "terms": [
+                "allotment",
+                "garden"
+            ],
+            "name": "Community Garden"
         },
         "landuse/basin": {
             "geometry": [
@@ -4833,6 +5291,23 @@ iD.data.presets = {
             "terms": [],
             "name": "Orchard"
         },
+        "landuse/plant_nursery": {
+            "icon": "garden",
+            "fields": [
+                "name"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "landuse": "plant_nursery"
+            },
+            "terms": [
+                "vivero"
+            ],
+            "name": "Plant Nursery"
+        },
         "landuse/quarry": {
             "geometry": [
                 "area"
@@ -4888,6 +5363,45 @@ iD.data.presets = {
             },
             "name": "Leisure"
         },
+        "leisure/adult_gaming_centre": {
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours",
+                "smoking"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "gambling",
+                "slot machine"
+            ],
+            "tags": {
+                "leisure": "adult_gaming_centre"
+            },
+            "name": "Adult Gaming Center"
+        },
+        "leisure/bowling_alley": {
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours",
+                "smoking"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "leisure": "bowling_alley"
+            },
+            "name": "Bowling Alley"
+        },
         "leisure/common": {
             "geometry": [
                 "point",
@@ -4984,6 +5498,15 @@ iD.data.presets = {
         },
         "leisure/marina": {
             "icon": "harbor",
+            "fields": [
+                "operator",
+                "address",
+                "capacity",
+                "fee",
+                "sanitary_dump_station",
+                "power_supply",
+                "internet_access"
+            ],
             "geometry": [
                 "point",
                 "vertex",
@@ -5127,6 +5650,40 @@ iD.data.presets = {
             "terms": [],
             "name": "Basketball Court"
         },
+        "leisure/pitch/rugby_league": {
+            "icon": "america-football",
+            "fields": [
+                "surface",
+                "lit"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "leisure": "pitch",
+                "sport": "rugby_league"
+            },
+            "terms": [],
+            "name": "Rugby League Field"
+        },
+        "leisure/pitch/rugby_union": {
+            "icon": "america-football",
+            "fields": [
+                "surface",
+                "lit"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "leisure": "pitch",
+                "sport": "rugby_union"
+            },
+            "terms": [],
+            "name": "Rugby Union Field"
+        },
         "leisure/pitch/skateboard": {
             "icon": "pitch",
             "fields": [
@@ -5336,6 +5893,25 @@ iD.data.presets = {
             },
             "name": "Man Made"
         },
+        "man_made/adit": {
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "fields": [
+                "operator"
+            ],
+            "terms": [
+                "entrance",
+                "underground",
+                "mine",
+                "cave"
+            ],
+            "tags": {
+                "man_made": "adit"
+            },
+            "name": "Adit"
+        },
         "man_made/breakwater": {
             "geometry": [
                 "line",
@@ -5346,6 +5922,16 @@ iD.data.presets = {
             },
             "name": "Breakwater"
         },
+        "man_made/chimney": {
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "man_made": "chimney"
+            },
+            "name": "Chimney"
+        },
         "man_made/cutline": {
             "geometry": [
                 "line"
@@ -5375,8 +5961,34 @@ iD.data.presets = {
             "name": "Flagpole",
             "icon": "embassy"
         },
+        "man_made/gasometer": {
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "gas holder"
+            ],
+            "tags": {
+                "man_made": "gasometer"
+            },
+            "name": "Gasometer"
+        },
+        "man_made/groyne": {
+            "geometry": [
+                "line",
+                "area"
+            ],
+            "tags": {
+                "man_made": "groyne"
+            },
+            "name": "Groyne"
+        },
         "man_made/lighthouse": {
             "icon": "lighthouse",
+            "fields": [
+                "building_area"
+            ],
             "geometry": [
                 "point",
                 "area"
@@ -5386,6 +5998,27 @@ iD.data.presets = {
             },
             "name": "Lighthouse"
         },
+        "man_made/mast": {
+            "geometry": [
+                "point"
+            ],
+            "terms": [
+                "broadcast tower",
+                "cell phone tower",
+                "cell tower",
+                "guyed tower",
+                "mobile phone tower",
+                "radio tower",
+                "television tower",
+                "transmission mast",
+                "transmission tower",
+                "tv tower"
+            ],
+            "tags": {
+                "man_made": "mast"
+            },
+            "name": "Radio Mast"
+        },
         "man_made/observation": {
             "geometry": [
                 "point",
@@ -5401,6 +6034,25 @@ iD.data.presets = {
             },
             "name": "Observation Tower"
         },
+        "man_made/petroleum_well": {
+            "geometry": [
+                "point"
+            ],
+            "terms": [
+                "drilling rig",
+                "oil derrick",
+                "oil drill",
+                "oil horse",
+                "oil rig",
+                "oil pump",
+                "petroleum well",
+                "pumpjack"
+            ],
+            "tags": {
+                "man_made": "petroleum_well"
+            },
+            "name": "Oil Well"
+        },
         "man_made/pier": {
             "geometry": [
                 "line",
@@ -5412,7 +6064,7 @@ iD.data.presets = {
             "name": "Pier"
         },
         "man_made/pipeline": {
-            "icon": "pipeline",
+            "icon": "pipeline-line",
             "fields": [
                 "location",
                 "operator"
@@ -5425,6 +6077,55 @@ iD.data.presets = {
             },
             "name": "Pipeline"
         },
+        "man_made/silo": {
+            "fields": [
+                "building_area",
+                "crop"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "grain",
+                "corn",
+                "wheat"
+            ],
+            "tags": {
+                "man_made": "silo"
+            },
+            "name": "Silo"
+        },
+        "man_made/storage_tank": {
+            "fields": [
+                "building_area",
+                "content"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "water",
+                "oil",
+                "gas",
+                "petrol"
+            ],
+            "tags": {
+                "man_made": "storage_tank"
+            },
+            "name": "Storage Tank"
+        },
+        "man_made/surveillance": {
+            "icon": "camera",
+            "geometry": [
+                "point"
+            ],
+            "tags": {
+                "man_made": "surveillance"
+            },
+            "name": "Surveillance"
+        },
         "man_made/survey_point": {
             "icon": "monument",
             "fields": [
@@ -5514,6 +6215,24 @@ iD.data.presets = {
             },
             "name": "Water Works"
         },
+        "man_made/works": {
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "car assembly plant",
+                "aluminium processing plant",
+                "brewery",
+                "furniture manufacture factory",
+                "oil refinery",
+                "platic recycling"
+            ],
+            "tags": {
+                "man_made": "works"
+            },
+            "name": "Works"
+        },
         "military/airfield": {
             "icon": "airfield",
             "geometry": [
@@ -5551,6 +6270,54 @@ iD.data.presets = {
             },
             "name": "Bunker"
         },
+        "military/checkpoint": {
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "military": "checkpoint"
+            },
+            "name": "Checkpoint"
+        },
+        "military/danger_area": {
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "military": "danger_area"
+            },
+            "name": "Danger Area"
+        },
+        "military/naval_base": {
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "military": "naval_base"
+            },
+            "name": "Naval Base"
+        },
+        "military/obstacle_course": {
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "military": "obstacle_course"
+            },
+            "name": "Obstacle Course"
+        },
         "military/range": {
             "geometry": [
                 "point",
@@ -5563,6 +6330,18 @@ iD.data.presets = {
             },
             "name": "Military Range"
         },
+        "military/training_area": {
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "military": "training_area"
+            },
+            "name": "Training area"
+        },
         "natural": {
             "fields": [
                 "natural"
@@ -5611,7 +6390,13 @@ iD.data.presets = {
                 "fee",
                 "access_simple"
             ],
-            "terms": [],
+            "terms": [
+                "cavern",
+                "hollow",
+                "grotto",
+                "shelter",
+                "cavity"
+            ],
             "tags": {
                 "natural": "cave_entrance"
             },
@@ -5712,6 +6497,25 @@ iD.data.presets = {
             ],
             "name": "Peak"
         },
+        "natural/saddle": {
+            "icon": "triangle-stroked",
+            "fields": [
+                "elevation"
+            ],
+            "geometry": [
+                "point",
+                "vertex"
+            ],
+            "tags": {
+                "natural": "saddle"
+            },
+            "terms": [
+                "pass",
+                "mountain pass",
+                "top"
+            ],
+            "name": "Saddle"
+        },
         "natural/scree": {
             "geometry": [
                 "area"
@@ -5731,7 +6535,10 @@ iD.data.presets = {
             "tags": {
                 "natural": "scrub"
             },
-            "terms": [],
+            "terms": [
+                "bush",
+                "shrubs"
+            ],
             "name": "Scrub"
         },
         "natural/spring": {
@@ -5747,8 +6554,8 @@ iD.data.presets = {
         },
         "natural/tree": {
             "fields": [
-                "leaf_type",
-                "leaf_cycle",
+                "leaf_type_singular",
+                "leaf_cycle_singular",
                 "denotation"
             ],
             "icon": "park",
@@ -5762,6 +6569,40 @@ iD.data.presets = {
             },
             "name": "Tree"
         },
+        "natural/tree_row": {
+            "fields": [
+                "leaf_type",
+                "leaf_cycle",
+                "denotation"
+            ],
+            "icon": "park",
+            "geometry": [
+                "line"
+            ],
+            "terms": [],
+            "tags": {
+                "natural": "tree_row"
+            },
+            "name": "Tree row"
+        },
+        "natural/volcano": {
+            "icon": "triangle",
+            "fields": [
+                "elevation"
+            ],
+            "geometry": [
+                "point",
+                "vertex"
+            ],
+            "tags": {
+                "natural": "volcano"
+            },
+            "terms": [
+                "mountain",
+                "crater"
+            ],
+            "name": "Volcano"
+        },
         "natural/water": {
             "fields": [
                 "water"
@@ -6278,6 +7119,7 @@ iD.data.presets = {
             "tags": {
                 "place": "*"
             },
+            "searchable": false,
             "name": "Place"
         },
         "place/city": {
@@ -6294,6 +7136,17 @@ iD.data.presets = {
             },
             "name": "City"
         },
+        "place/farm": {
+            "icon": "farm",
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "place": "farm"
+            },
+            "name": "Farm"
+        },
         "place/hamlet": {
             "icon": "triangle-stroked",
             "fields": [
@@ -6436,6 +7289,7 @@ iD.data.presets = {
             "fields": [
                 "power"
             ],
+            "searchable": false,
             "name": "Power"
         },
         "power/generator": {
@@ -6538,8 +7392,8 @@ iD.data.presets = {
         "public_transport/platform": {
             "fields": [
                 "ref",
-                "operator",
                 "network",
+                "operator",
                 "shelter"
             ],
             "geometry": [
@@ -6557,8 +7411,8 @@ iD.data.presets = {
             "icon": "bus",
             "fields": [
                 "ref",
-                "operator",
-                "network"
+                "network",
+                "operator"
             ],
             "geometry": [
                 "vertex"
@@ -6581,6 +7435,7 @@ iD.data.presets = {
             "tags": {
                 "railway": "*"
             },
+            "searchable": false,
             "name": "Railway"
         },
         "railway/abandoned": {
@@ -6592,7 +7447,8 @@ iD.data.presets = {
                 "railway": "abandoned"
             },
             "fields": [
-                "structure"
+                "structure",
+                "service_rail"
             ],
             "terms": [],
             "name": "Abandoned Railway"
@@ -6606,7 +7462,8 @@ iD.data.presets = {
                 "railway": "disused"
             },
             "fields": [
-                "structure"
+                "structure",
+                "service_rail"
             ],
             "terms": [],
             "name": "Disused Railway"
@@ -6624,7 +7481,8 @@ iD.data.presets = {
             ],
             "fields": [
                 "structure",
-                "gauge"
+                "gauge",
+                "service_rail"
             ],
             "tags": {
                 "railway": "funicular"
@@ -6661,12 +7519,12 @@ iD.data.presets = {
             "terms": [
                 "crossing",
                 "railroad crossing",
-                "railway crossing",
+                "level crossing",
                 "grade crossing",
                 "road through railroad",
                 "train crossing"
             ],
-            "name": "Level Crossing"
+            "name": "Railway Crossing"
         },
         "railway/monorail": {
             "icon": "railway-monorail",
@@ -6678,7 +7536,8 @@ iD.data.presets = {
             },
             "fields": [
                 "structure",
-                "electrified"
+                "electrified",
+                "service_rail"
             ],
             "terms": [],
             "name": "Monorail"
@@ -6694,7 +7553,8 @@ iD.data.presets = {
             "fields": [
                 "structure",
                 "gauge",
-                "electrified"
+                "electrified",
+                "service_rail"
             ],
             "terms": [
                 "narrow gauge railway",
@@ -6725,7 +7585,8 @@ iD.data.presets = {
             "fields": [
                 "structure",
                 "gauge",
-                "electrified"
+                "electrified",
+                "service_rail"
             ],
             "terms": [],
             "name": "Rail"
@@ -6733,6 +7594,7 @@ iD.data.presets = {
         "railway/station": {
             "icon": "rail",
             "fields": [
+                "network",
                 "operator",
                 "address",
                 "building_area"
@@ -6753,17 +7615,18 @@ iD.data.presets = {
         },
         "railway/subway": {
             "icon": "railway-subway",
-            "fields": [
-                "structure",
-                "gauge",
-                "electrified"
-            ],
             "geometry": [
                 "line"
             ],
             "tags": {
                 "railway": "subway"
             },
+            "fields": [
+                "structure",
+                "gauge",
+                "electrified",
+                "service_rail"
+            ],
             "terms": [],
             "name": "Subway"
         },
@@ -6789,7 +7652,8 @@ iD.data.presets = {
             "fields": [
                 "structure",
                 "gauge",
-                "electrified"
+                "electrified",
+                "service_rail"
             ],
             "terms": [
                 "streetcar"
@@ -6807,8 +7671,19 @@ iD.data.presets = {
                 "relation"
             ]
         },
+        "roundabout": {
+            "geometry": [
+                "vertex",
+                "line"
+            ],
+            "tags": {
+                "junction": "roundabout"
+            },
+            "name": "Roundabout",
+            "searchable": false
+        },
         "route/ferry": {
-            "icon": "ferry",
+            "icon": "ferry-line",
             "geometry": [
                 "line"
             ],
@@ -6842,7 +7717,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "geometry": [
                 "point",
@@ -7051,6 +7927,10 @@ iD.data.presets = {
                 "point",
                 "area"
             ],
+            "terms": [
+                "bike",
+                "repair"
+            ],
             "tags": {
                 "shop": "bicycle"
             },
@@ -8906,29 +9786,43 @@ iD.data.presets = {
             "icon": "campsite",
             "fields": [
                 "operator",
-                "address"
+                "address",
+                "capacity",
+                "fee"
             ],
             "geometry": [
                 "point",
                 "vertex",
                 "area"
             ],
+            "terms": [
+                "Tent"
+            ],
             "tags": {
                 "tourism": "camp_site"
             },
             "name": "Camp Site"
         },
         "tourism/caravan_site": {
+            "icon": "bus",
             "fields": [
                 "operator",
                 "address",
-                "smoking"
+                "capacity",
+                "fee",
+                "sanitary_dump_station",
+                "power_supply",
+                "internet_access"
             ],
             "geometry": [
                 "point",
                 "vertex",
                 "area"
             ],
+            "terms": [
+                "Motor Home",
+                "Camper"
+            ],
             "tags": {
                 "tourism": "caravan_site"
             },
@@ -9558,8 +10452,24 @@ iD.data.presets = {
             "tags": {
                 "waterway": "*"
             },
+            "searchable": false,
             "name": "Waterway"
         },
+        "waterway/boatyard": {
+            "icon": "harbor",
+            "fields": [
+                "operator"
+            ],
+            "geometry": [
+                "area",
+                "vertex",
+                "point"
+            ],
+            "tags": {
+                "waterway": "boatyard"
+            },
+            "name": "Boatyard"
+        },
         "waterway/canal": {
             "icon": "waterway-canal",
             "fields": [
@@ -9599,6 +10509,22 @@ iD.data.presets = {
             },
             "name": "Ditch"
         },
+        "waterway/dock": {
+            "icon": "harbor",
+            "fields": [
+                "dock",
+                "operator"
+            ],
+            "geometry": [
+                "area",
+                "vertex",
+                "point"
+            ],
+            "tags": {
+                "waterway": "dock"
+            },
+            "name": "Dock"
+        },
         "waterway/drain": {
             "icon": "waterway-stream",
             "fields": [
@@ -9612,6 +10538,28 @@ iD.data.presets = {
             },
             "name": "Drain"
         },
+        "waterway/fuel": {
+            "icon": "fuel",
+            "fields": [
+                "operator",
+                "address",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "petrol",
+                "gas",
+                "diesel",
+                "boat"
+            ],
+            "tags": {
+                "waterway": "fuel"
+            },
+            "name": "Marine Fuel Station"
+        },
         "waterway/river": {
             "icon": "waterway-river",
             "fields": [
@@ -9651,6 +10599,35 @@ iD.data.presets = {
             },
             "name": "Riverbank"
         },
+        "waterway/sanitary_dump_station": {
+            "fields": [
+                "operator",
+                "access_toilets",
+                "fee",
+                "water_point"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [
+                "Boat",
+                "Watercraft",
+                "Sanitary",
+                "Dump Station",
+                "Pumpout",
+                "Pump out",
+                "Elsan",
+                "CDP",
+                "CTDP",
+                "Chemical Toilet"
+            ],
+            "tags": {
+                "waterway": "sanitary_dump_station"
+            },
+            "name": "Marine Toilet Disposal"
+        },
         "waterway/stream": {
             "icon": "waterway-stream",
             "fields": [
@@ -9692,6 +10669,18 @@ iD.data.presets = {
             },
             "name": "Stream"
         },
+        "waterway/water_point": {
+            "icon": "water",
+            "geometry": [
+                "area",
+                "vertex",
+                "point"
+            ],
+            "tags": {
+                "waterway": "water_point"
+            },
+            "name": "Marine Drinking Water"
+        },
         "waterway/weir": {
             "icon": "dam",
             "geometry": [
@@ -9717,7 +10706,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9736,7 +10724,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9755,7 +10742,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9774,7 +10760,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9793,7 +10778,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9812,7 +10796,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9831,7 +10814,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9850,7 +10832,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9869,7 +10850,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9888,7 +10868,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9907,7 +10886,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9926,7 +10904,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9945,7 +10922,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9964,7 +10940,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9983,7 +10958,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10002,7 +10976,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10021,7 +10994,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10040,7 +11012,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10059,7 +11030,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10078,7 +11048,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10097,7 +11066,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10116,7 +11084,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10135,7 +11102,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10154,7 +11120,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10173,7 +11138,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10192,7 +11156,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10211,7 +11174,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10230,7 +11192,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10249,7 +11210,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10268,7 +11228,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10287,7 +11246,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10306,7 +11264,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10325,7 +11282,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10344,7 +11300,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10363,7 +11318,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10382,7 +11336,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10401,7 +11354,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10420,7 +11372,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10439,7 +11390,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10458,7 +11408,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10477,7 +11426,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10496,7 +11444,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10515,7 +11462,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10534,7 +11480,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10553,7 +11498,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10572,7 +11516,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10591,7 +11534,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10610,7 +11552,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10629,7 +11570,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10648,7 +11588,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10667,7 +11606,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10686,7 +11624,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10705,7 +11642,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10724,7 +11660,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10743,7 +11678,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10762,7 +11696,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10781,7 +11714,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10800,7 +11732,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10819,7 +11750,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10838,7 +11768,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10857,7 +11786,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10876,7 +11804,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10895,7 +11822,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10914,7 +11840,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10933,7 +11858,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10952,7 +11876,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10971,7 +11894,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10990,7 +11912,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11009,7 +11930,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11028,7 +11948,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11047,7 +11966,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11066,7 +11984,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11085,7 +12002,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11104,7 +12020,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11123,7 +12038,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11142,7 +12056,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11161,7 +12074,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11180,7 +12092,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11199,7 +12110,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11218,7 +12128,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11237,7 +12146,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11256,7 +12164,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11275,7 +12182,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11294,7 +12200,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11313,7 +12218,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11332,7 +12236,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11351,7 +12254,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11370,7 +12272,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11389,7 +12290,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11408,7 +12308,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11427,7 +12326,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11446,7 +12344,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11465,7 +12362,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11484,7 +12380,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11503,7 +12398,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11522,7 +12416,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11541,7 +12434,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11560,7 +12452,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11579,7 +12470,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11598,7 +12488,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11617,7 +12506,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11636,7 +12524,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11655,7 +12542,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11674,7 +12560,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11693,7 +12578,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11712,7 +12596,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11731,7 +12614,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11750,7 +12632,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11769,7 +12650,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11788,7 +12668,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11807,7 +12686,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11826,7 +12704,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11845,7 +12722,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11864,7 +12740,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11883,7 +12758,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11902,7 +12776,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11921,7 +12794,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11940,7 +12812,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11959,7 +12830,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11978,7 +12848,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11997,7 +12866,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12016,7 +12884,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12035,7 +12902,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12054,7 +12920,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12073,7 +12938,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12092,7 +12956,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12111,7 +12974,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12130,7 +12992,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12149,7 +13010,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12168,7 +13028,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12187,26 +13046,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
-        "amenity/fuel/Stacja paliw": {
-            "tags": {
-                "name": "Stacja paliw",
-                "amenity": "fuel"
-            },
-            "name": "Stacja paliw",
-            "icon": "fuel",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12225,7 +13064,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12244,7 +13082,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12263,7 +13100,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12282,7 +13118,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12301,7 +13136,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12320,7 +13154,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12339,7 +13172,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12358,7 +13190,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12378,7 +13209,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12397,7 +13227,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12416,7 +13245,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12435,7 +13263,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12454,7 +13281,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12473,7 +13299,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12492,7 +13317,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12511,7 +13335,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12530,7 +13353,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12549,7 +13371,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12568,7 +13389,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12587,7 +13407,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12606,7 +13425,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12625,7 +13443,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12644,7 +13461,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12663,7 +13479,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12682,7 +13497,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12701,7 +13515,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12720,7 +13533,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12739,7 +13551,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12758,7 +13569,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12777,7 +13587,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12796,7 +13605,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12815,7 +13623,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12834,7 +13641,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12853,7 +13659,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12872,7 +13677,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12891,7 +13695,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12910,7 +13713,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12929,7 +13731,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13808,6 +14609,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13832,6 +14634,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13856,6 +14659,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13880,6 +14684,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13903,6 +14708,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13927,6 +14733,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13950,6 +14757,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13974,6 +14782,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13998,6 +14807,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14021,6 +14831,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14044,6 +14855,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14067,6 +14879,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14090,6 +14903,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14114,6 +14928,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14137,6 +14952,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14160,6 +14976,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14184,6 +15001,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14207,6 +15025,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14230,6 +15049,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14253,6 +15073,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14276,6 +15097,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14299,6 +15121,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14322,6 +15145,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14345,6 +15169,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14368,6 +15193,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14391,6 +15217,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14415,6 +15242,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14438,6 +15266,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14461,6 +15290,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14484,6 +15314,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14507,6 +15338,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14530,6 +15362,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14554,6 +15387,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14578,6 +15412,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14601,6 +15436,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14625,6 +15461,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14632,6 +15469,7 @@ iD.data.presets = {
         "amenity/fast_food/Taco Bell": {
             "tags": {
                 "name": "Taco Bell",
+                "cuisine": "mexican",
                 "amenity": "fast_food"
             },
             "name": "Taco Bell",
@@ -14648,6 +15486,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14671,6 +15510,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14695,6 +15535,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14718,6 +15559,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14741,29 +15583,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
-                "smoking"
-            ],
-            "suggestion": true
-        },
-        "amenity/fast_food/Kebab": {
-            "tags": {
-                "name": "Kebab",
-                "amenity": "fast_food"
-            },
-            "name": "Kebab",
-            "icon": "fast-food",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "cuisine",
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours",
-                "takeaway",
-                "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14788,6 +15608,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14811,29 +15632,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
-                "smoking"
-            ],
-            "suggestion": true
-        },
-        "amenity/fast_food/Imbiss": {
-            "tags": {
-                "name": "Imbiss",
-                "amenity": "fast_food"
-            },
-            "name": "Imbiss",
-            "icon": "fast-food",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "cuisine",
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours",
-                "takeaway",
-                "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14858,6 +15657,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14883,6 +15683,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14906,6 +15707,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14929,6 +15731,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14952,6 +15755,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14975,6 +15779,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14998,6 +15803,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15023,6 +15829,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15046,6 +15853,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15069,6 +15877,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15093,6 +15902,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15116,6 +15926,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15139,6 +15950,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15162,6 +15974,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15185,6 +15998,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15208,6 +16022,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15232,6 +16047,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15239,6 +16055,7 @@ iD.data.presets = {
         "amenity/fast_food/Panda Express": {
             "tags": {
                 "name": "Panda Express",
+                "cuisine": "chinese",
                 "amenity": "fast_food"
             },
             "name": "Panda Express",
@@ -15255,6 +16072,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15278,6 +16096,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15301,6 +16120,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15324,6 +16144,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15347,6 +16168,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15370,6 +16192,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15393,6 +16216,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15417,6 +16241,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15440,6 +16265,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15463,6 +16289,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15486,6 +16313,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15510,6 +16338,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15534,6 +16363,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15557,6 +16387,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15580,6 +16411,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15587,6 +16419,7 @@ iD.data.presets = {
         "amenity/restaurant/Pizza Hut": {
             "tags": {
                 "name": "Pizza Hut",
+                "cuisine": "pizza",
                 "amenity": "restaurant"
             },
             "name": "Pizza Hut",
@@ -18476,7 +19309,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18496,7 +19330,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18516,7 +19351,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18536,7 +19372,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18556,7 +19393,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18576,7 +19414,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18596,7 +19435,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18616,7 +19456,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18636,7 +19477,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18656,7 +19498,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18676,7 +19519,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18696,7 +19540,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18716,7 +19561,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18736,7 +19582,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18756,7 +19603,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18776,7 +19624,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18796,7 +19645,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18816,7 +19666,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18836,7 +19687,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18856,7 +19708,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18876,7 +19729,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18896,7 +19750,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18916,7 +19771,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18936,7 +19792,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18956,7 +19813,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18976,7 +19834,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18996,7 +19855,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19016,7 +19876,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19036,7 +19897,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19056,7 +19918,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19076,7 +19939,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19096,7 +19960,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19116,7 +19981,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19136,7 +20002,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19156,7 +20023,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19176,7 +20044,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19196,7 +20065,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19216,7 +20086,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19236,7 +20107,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19256,7 +20128,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19276,7 +20149,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19296,7 +20170,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19316,7 +20191,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19336,7 +20212,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19356,7 +20233,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19376,7 +20254,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19396,7 +20275,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19416,7 +20296,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19436,7 +20317,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19456,7 +20338,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19476,7 +20359,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19496,7 +20380,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19516,7 +20401,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19536,7 +20422,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19556,7 +20443,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19576,7 +20464,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19596,7 +20485,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19616,7 +20506,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19636,7 +20527,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19656,7 +20548,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19676,7 +20569,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19696,7 +20590,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19716,7 +20611,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19736,7 +20632,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19756,7 +20653,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19776,7 +20674,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19796,7 +20695,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19816,7 +20716,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19836,7 +20737,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19856,7 +20758,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19876,7 +20779,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19896,7 +20800,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19916,7 +20821,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19936,7 +20842,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19956,7 +20863,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19976,7 +20884,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19996,7 +20905,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20016,7 +20926,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20036,7 +20947,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20056,7 +20968,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20076,7 +20989,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20096,7 +21010,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20116,7 +21031,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20136,7 +21052,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20156,7 +21073,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20176,7 +21094,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20196,7 +21115,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20216,7 +21136,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20236,7 +21157,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20256,7 +21178,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20276,7 +21199,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20296,7 +21220,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20316,7 +21241,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20336,7 +21262,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20356,7 +21283,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20376,7 +21304,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20396,7 +21325,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20416,7 +21346,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20436,7 +21367,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20456,7 +21388,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20476,7 +21409,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20496,7 +21430,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20516,7 +21451,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20536,7 +21472,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20556,7 +21493,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20576,7 +21514,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20596,7 +21535,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20616,7 +21556,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20636,7 +21577,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20656,7 +21598,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20676,7 +21619,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20696,7 +21640,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20716,7 +21661,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20736,7 +21682,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20756,7 +21703,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20776,7 +21724,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20796,7 +21745,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20816,7 +21766,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20836,7 +21787,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20856,7 +21808,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20876,7 +21829,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20896,7 +21850,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20916,7 +21871,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20936,7 +21892,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20956,7 +21913,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20976,7 +21934,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20996,7 +21955,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21016,7 +21976,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21036,7 +21997,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21056,7 +22018,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21076,7 +22039,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21096,7 +22060,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21116,7 +22081,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21136,7 +22102,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21156,7 +22123,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21176,7 +22144,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21196,7 +22165,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21216,7 +22186,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21236,7 +22207,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21256,7 +22228,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21276,7 +22249,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21296,7 +22270,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21316,7 +22291,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21336,7 +22312,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21356,7 +22333,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21376,7 +22354,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21396,7 +22375,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21416,7 +22396,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21436,7 +22417,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21456,7 +22438,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21476,7 +22459,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21496,7 +22480,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21516,7 +22501,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21536,7 +22522,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21556,7 +22543,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21576,7 +22564,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21596,7 +22585,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21616,7 +22606,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21636,7 +22627,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21656,7 +22648,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21676,7 +22669,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21696,7 +22690,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21716,7 +22711,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21736,7 +22732,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21756,7 +22753,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21776,7 +22774,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21796,7 +22795,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21816,7 +22816,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21836,7 +22837,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21856,7 +22858,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21876,7 +22879,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21896,7 +22900,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21916,7 +22921,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21936,7 +22942,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21956,7 +22963,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21976,7 +22984,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21996,7 +23005,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22016,7 +23026,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22036,7 +23047,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22056,7 +23068,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22076,7 +23089,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22096,7 +23110,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22116,7 +23131,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22136,7 +23152,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22156,7 +23173,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22176,7 +23194,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22196,16 +23215,17 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
-        "amenity/bank/Millenium Bank": {
+        "amenity/bank/Millenium": {
             "tags": {
-                "name": "Millenium Bank",
+                "name": "Millenium",
                 "amenity": "bank"
             },
-            "name": "Millenium Bank",
+            "name": "Millenium",
             "icon": "bank",
             "geometry": [
                 "point",
@@ -22216,7 +23236,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22236,7 +23257,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22256,7 +23278,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22276,7 +23299,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22296,7 +23320,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22316,7 +23341,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22336,7 +23362,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22356,7 +23383,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22376,7 +23404,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22396,7 +23425,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22416,7 +23446,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22436,7 +23467,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22456,7 +23488,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22476,7 +23509,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22496,7 +23530,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22516,7 +23551,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22536,7 +23572,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22556,7 +23593,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22576,7 +23614,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22596,7 +23635,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22616,7 +23656,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22636,7 +23677,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22656,7 +23698,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22676,7 +23719,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22696,7 +23740,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22717,7 +23762,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22738,7 +23784,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22759,7 +23806,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22780,7 +23828,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22801,7 +23850,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22821,7 +23871,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22841,7 +23892,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22861,7 +23913,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22881,7 +23934,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22901,7 +23955,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22921,7 +23976,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22941,7 +23997,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22962,7 +24019,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22982,7 +24040,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23002,7 +24061,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23022,7 +24082,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23042,7 +24103,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23062,7 +24124,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23082,7 +24145,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23102,7 +24166,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23122,7 +24187,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23142,7 +24208,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23162,7 +24229,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23182,7 +24250,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23202,7 +24271,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23222,7 +24292,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23242,7 +24313,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23262,7 +24334,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23282,7 +24355,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23302,7 +24376,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23322,7 +24397,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23342,7 +24418,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23363,7 +24440,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23383,7 +24461,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23403,7 +24482,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23423,7 +24503,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23443,7 +24524,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23463,7 +24545,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23483,7 +24566,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23503,7 +24587,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23634,7 +24719,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23653,7 +24739,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23672,7 +24759,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23691,7 +24779,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23710,7 +24799,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23729,7 +24819,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23748,7 +24839,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23767,7 +24859,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23786,7 +24879,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23805,7 +24899,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23824,7 +24919,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23843,7 +24939,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23862,7 +24959,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23881,7 +24979,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23900,7 +24999,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23919,7 +25019,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23938,7 +25039,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23957,7 +25059,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23976,7 +25079,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23995,7 +25099,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24014,7 +25119,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24033,7 +25139,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24052,7 +25159,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24071,7 +25179,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24090,7 +25199,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24109,7 +25219,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24128,7 +25239,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24147,7 +25259,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24166,7 +25279,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24185,7 +25299,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24204,7 +25319,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24223,7 +25339,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24242,7 +25359,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24261,7 +25379,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24280,7 +25399,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24299,7 +25419,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24318,7 +25439,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24337,7 +25459,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24356,7 +25479,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24375,7 +25499,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24394,7 +25519,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24413,7 +25539,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24432,7 +25559,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24451,7 +25579,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24470,7 +25599,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24489,7 +25619,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24508,7 +25639,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24527,7 +25659,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24546,7 +25679,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24565,7 +25699,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24584,7 +25719,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24603,7 +25739,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24622,7 +25759,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24641,7 +25779,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24660,7 +25799,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24679,7 +25819,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24698,7 +25839,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24717,7 +25859,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24736,7 +25879,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24755,7 +25899,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24774,7 +25919,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24793,7 +25939,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24812,7 +25959,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24831,7 +25979,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24850,7 +25999,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24869,7 +26019,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24888,7 +26039,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24907,7 +26059,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24926,7 +26079,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24945,7 +26099,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24964,7 +26119,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24983,7 +26139,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -25002,7 +26159,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -25021,7 +26179,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -25173,27 +26332,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "amenity/cafe/Eisdiele": {
-            "tags": {
-                "name": "Eisdiele",
-                "amenity": "cafe"
-            },
-            "name": "Eisdiele",
-            "icon": "cafe",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "cuisine",
-                "internet_access",
-                "address",
-                "building_area",
-                "opening_hours",
-                "smoking"
-            ],
-            "suggestion": true
-        },
         "amenity/cafe/Dunkin Donuts": {
             "tags": {
                 "name": "Dunkin Donuts",
@@ -25732,12 +26870,12 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/supermarket/EDEKA": {
+        "shop/supermarket/Edeka": {
             "tags": {
-                "name": "EDEKA",
+                "name": "Edeka",
                 "shop": "supermarket"
             },
-            "name": "EDEKA",
+            "name": "Edeka",
             "icon": "grocery",
             "geometry": [
                 "point",
@@ -26093,25 +27231,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/supermarket/REWE": {
-            "tags": {
-                "name": "REWE",
-                "shop": "supermarket"
-            },
-            "name": "REWE",
-            "icon": "grocery",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/supermarket/Rewe": {
             "tags": {
                 "name": "Rewe",
@@ -26207,25 +27326,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/supermarket/Edeka": {
-            "tags": {
-                "name": "Edeka",
-                "shop": "supermarket"
-            },
-            "name": "Edeka",
-            "icon": "grocery",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/supermarket/Pick n Pay": {
             "tags": {
                 "name": "Pick n Pay",
@@ -26378,25 +27478,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/supermarket/LIDL": {
-            "tags": {
-                "name": "LIDL",
-                "shop": "supermarket"
-            },
-            "name": "LIDL",
-            "icon": "grocery",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/supermarket/tegut": {
             "tags": {
                 "name": "tegut",
@@ -26853,25 +27934,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/supermarket/COOP": {
-            "tags": {
-                "name": "COOP",
-                "shop": "supermarket"
-            },
-            "name": "COOP",
-            "icon": "grocery",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/supermarket/Food Basics": {
             "tags": {
                 "name": "Food Basics",
@@ -28354,12 +29416,12 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/supermarket/Co-operative Food": {
+        "shop/supermarket/The Co-operative Food": {
             "tags": {
-                "name": "Co-operative Food",
+                "name": "The Co-operative Food",
                 "shop": "supermarket"
             },
-            "name": "Co-operative Food",
+            "name": "The Co-operative Food",
             "icon": "grocery",
             "geometry": [
                 "point",
@@ -28867,25 +29929,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/supermarket/SPAR": {
-            "tags": {
-                "name": "SPAR",
-                "shop": "supermarket"
-            },
-            "name": "SPAR",
-            "icon": "grocery",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/supermarket/No Frills": {
             "tags": {
                 "name": "No Frills",
@@ -28981,25 +30024,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/supermarket/The Co-operative Food": {
-            "tags": {
-                "name": "The Co-operative Food",
-                "shop": "supermarket"
-            },
-            "name": "The Co-operative Food",
-            "icon": "grocery",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/supermarket/Eurospin": {
             "tags": {
                 "name": "Eurospin",
@@ -31114,25 +32138,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/convenience/Sklep spożywczy": {
-            "tags": {
-                "name": "Sklep spożywczy",
-                "shop": "convenience"
-            },
-            "name": "Sklep spożywczy",
-            "icon": "shop",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/convenience/Centra": {
             "tags": {
                 "name": "Centra",
@@ -31438,6 +32443,25 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
+        "shop/convenience/Sklep spożywczy": {
+            "tags": {
+                "name": "Sklep spożywczy",
+                "shop": "convenience"
+            },
+            "name": "Sklep spożywczy",
+            "icon": "shop",
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "suggestion": true
+        },
         "shop/convenience/24 часа": {
             "tags": {
                 "name": "24 часа",
@@ -31647,25 +32671,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/convenience/Spożywczy": {
-            "tags": {
-                "name": "Spożywczy",
-                "shop": "convenience"
-            },
-            "name": "Spożywczy",
-            "icon": "shop",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/convenience/Фортуна": {
             "tags": {
                 "name": "Фортуна",
@@ -32521,25 +33526,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/car_repair/Kwik-Fit": {
-            "tags": {
-                "name": "Kwik-Fit",
-                "shop": "car_repair"
-            },
-            "name": "Kwik-Fit",
-            "icon": "car",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/car_repair/Midas": {
             "tags": {
                 "name": "Midas",
@@ -32787,25 +33773,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/car_repair/AutoZone": {
-            "tags": {
-                "name": "AutoZone",
-                "shop": "car_repair"
-            },
-            "name": "AutoZone",
-            "icon": "car",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/car_repair/Автосервис": {
             "tags": {
                 "name": "Автосервис",
@@ -35975,7 +36942,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -35994,7 +36962,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36013,7 +36982,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36032,7 +37002,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36051,7 +37022,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36070,7 +37042,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36089,7 +37062,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36108,7 +37082,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36127,7 +37102,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36146,7 +37122,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36165,7 +37142,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36184,7 +37162,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36511,25 +37490,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/bakery/Bäcker": {
-            "tags": {
-                "name": "Bäcker",
-                "shop": "bakery"
-            },
-            "name": "Bäcker",
-            "icon": "bakery",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/bakery/Schäfer's": {
             "tags": {
                 "name": "Schäfer's",
@@ -36663,25 +37623,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/bakery/Piekarnia": {
-            "tags": {
-                "name": "Piekarnia",
-                "shop": "bakery"
-            },
-            "name": "Piekarnia",
-            "icon": "bakery",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/bakery/Пекарня": {
             "tags": {
                 "name": "Пекарня",
@@ -38297,25 +39238,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/hairdresser/Fryzjer": {
-            "tags": {
-                "name": "Fryzjer",
-                "shop": "hairdresser"
-            },
-            "name": "Fryzjer",
-            "icon": "hairdresser",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/hairdresser/Franck Provost": {
             "tags": {
                 "name": "Franck Provost",
@@ -38446,6 +39368,7 @@ iD.data.presets = {
         ],
         "vertex": [
             "highway/crosswalk",
+            "highway/crossing",
             "railway/level_crossing",
             "highway/traffic_signals",
             "highway/turning_circle",
@@ -38498,7 +39421,7 @@ iD.data.presets = {
                 "landuse/industrial",
                 "landuse/commercial",
                 "landuse/retail",
-                "landuse/farm",
+                "landuse/farmland",
                 "landuse/farmyard",
                 "landuse/forest",
                 "landuse/meadow",
@@ -38511,6 +39434,7 @@ iD.data.presets = {
             "name": "Path",
             "icon": "category-path",
             "members": [
+                "highway/pedestrian",
                 "highway/footway",
                 "highway/cycleway",
                 "highway/bridleway",
@@ -38625,11 +39549,11 @@ iD.data.presets = {
                 "key": "access"
             },
             "type": "access",
-            "label": "Access",
-            "placeholder": "Unknown",
+            "label": "Allowed Access",
+            "placeholder": "Not Specified",
             "strings": {
                 "types": {
-                    "access": "General",
+                    "access": "All",
                     "foot": "Foot",
                     "motor_vehicle": "Motor Vehicles",
                     "bicycle": "Bicycles",
@@ -38659,6 +39583,10 @@ iD.data.presets = {
                     "destination": {
                         "title": "Destination",
                         "description": "Access permitted only to reach a destination"
+                    },
+                    "dismount": {
+                        "title": "Dismount",
+                        "description": "Access permitted but rider must dismount"
                     }
                 }
             }
@@ -38666,7 +39594,7 @@ iD.data.presets = {
         "access_simple": {
             "key": "access",
             "type": "combo",
-            "label": "Access",
+            "label": "Allowed Access",
             "placeholder": "yes",
             "options": [
                 "permissive",
@@ -38691,9 +39619,18 @@ iD.data.presets = {
             "keys": [
                 "addr:housename",
                 "addr:housenumber",
+                "addr:conscriptionnumber",
                 "addr:street",
                 "addr:city",
-                "addr:postcode"
+                "addr:postcode",
+                "addr:place",
+                "addr:hamlet",
+                "addr:suburb",
+                "addr:subdistrict",
+                "addr:district",
+                "addr:province",
+                "addr:state",
+                "addr:country"
             ],
             "reference": {
                 "key": "addr"
@@ -38705,6 +39642,7 @@ iD.data.presets = {
                 "placeholders": {
                     "housename": "Housename",
                     "housenumber": "123",
+                    "conscriptionnumber": "123",
                     "street": "Street",
                     "city": "City",
                     "postcode": "Postcode",
@@ -38791,6 +39729,11 @@ iD.data.presets = {
             "type": "typeCombo",
             "label": "Type"
         },
+        "area/highway": {
+            "key": "area:highway",
+            "type": "typeCombo",
+            "label": "Type"
+        },
         "artist": {
             "key": "artist_name",
             "type": "text",
@@ -38843,7 +39786,7 @@ iD.data.presets = {
         },
         "building_area": {
             "key": "building",
-            "type": "defaultcheck",
+            "type": "combo",
             "default": "yes",
             "geometry": "area",
             "label": "Building"
@@ -38900,6 +39843,11 @@ iD.data.presets = {
             "type": "combo",
             "label": "Type"
         },
+        "content": {
+            "key": "content",
+            "type": "combo",
+            "label": "Contents"
+        },
         "country": {
             "key": "country",
             "type": "combo",
@@ -38930,6 +39878,54 @@ iD.data.presets = {
             "type": "combo",
             "label": "Cuisine"
         },
+        "cycleway": {
+            "keys": [
+                "cycleway:left",
+                "cycleway:right"
+            ],
+            "reference": {
+                "key": "cycleway"
+            },
+            "type": "cycleway",
+            "label": "Bike Lanes",
+            "placeholder": "none",
+            "strings": {
+                "types": {
+                    "cycleway:left": "Left side",
+                    "cycleway:right": "Right side"
+                },
+                "options": {
+                    "none": {
+                        "title": "None",
+                        "description": "No bike lane"
+                    },
+                    "lane": {
+                        "title": "Standard bike lane",
+                        "description": "A bike lane separated from auto traffic by a painted line"
+                    },
+                    "shared_lane": {
+                        "title": "Shared bike lane",
+                        "description": "A bike lane with no separation from auto traffic"
+                    },
+                    "track": {
+                        "title": "Bike track",
+                        "description": "A bike lane separated from traffic by a physical barrier"
+                    },
+                    "share_busway": {
+                        "title": "Bike lane shared with bus",
+                        "description": "A bike lane shared with a bus lane"
+                    },
+                    "opposite_lane": {
+                        "title": "Opposite bike lane",
+                        "description": "A bike lane that travels in the opposite direction of traffic"
+                    },
+                    "opposite": {
+                        "title": "Contraflow bike lane",
+                        "description": "A bike lane that travels in both directions on a one-way street"
+                    }
+                }
+            }
+        },
         "delivery": {
             "key": "delivery",
             "type": "check",
@@ -38950,6 +39946,31 @@ iD.data.presets = {
             "type": "textarea",
             "label": "Description"
         },
+        "diaper": {
+            "key": "diaper",
+            "type": "combo",
+            "label": "Diaper Changing Available",
+            "options": [
+                "yes",
+                "no",
+                "room",
+                "1",
+                "2",
+                "3",
+                "4",
+                "5"
+            ]
+        },
+        "dock": {
+            "key": "dock",
+            "type": "combo",
+            "label": "Type"
+        },
+        "drive_through": {
+            "key": "drive_through",
+            "type": "check",
+            "label": "Drive-Through"
+        },
         "electrified": {
             "key": "electrified",
             "type": "combo",
@@ -39114,6 +40135,11 @@ iD.data.presets = {
             "label": "Handicap",
             "placeholder": "1-18"
         },
+        "handrail": {
+            "key": "handrail",
+            "type": "check",
+            "label": "Handrail"
+        },
         "highway": {
             "key": "highway",
             "type": "typeCombo",
@@ -39145,6 +40171,17 @@ iD.data.presets = {
             "type": "combo",
             "label": "Incline"
         },
+        "incline_steps": {
+            "key": "incline",
+            "type": "combo",
+            "label": "Incline",
+            "strings": {
+                "options": {
+                    "up": "Up",
+                    "down": "Down"
+                }
+            }
+        },
         "information": {
             "key": "information",
             "type": "typeCombo",
@@ -39199,6 +40236,19 @@ iD.data.presets = {
                 }
             }
         },
+        "leaf_cycle_singular": {
+            "key": "leaf_cycle",
+            "type": "combo",
+            "label": "Leaf Cycle",
+            "strings": {
+                "options": {
+                    "evergreen": "Evergreen",
+                    "deciduous": "Deciduous",
+                    "semi_evergreen": "Semi-Evergreen",
+                    "semi_deciduous": "Semi-Deciduous"
+                }
+            }
+        },
         "leaf_type": {
             "key": "leaf_type",
             "type": "combo",
@@ -39212,6 +40262,18 @@ iD.data.presets = {
                 }
             }
         },
+        "leaf_type_singular": {
+            "key": "leaf_type",
+            "type": "combo",
+            "label": "Leaf Type",
+            "strings": {
+                "options": {
+                    "broadleaved": "Broadleaved",
+                    "needleleaved": "Needleleaved",
+                    "leafless": "Leafless"
+                }
+            }
+        },
         "leisure": {
             "key": "leisure",
             "type": "typeCombo",
@@ -39222,6 +40284,12 @@ iD.data.presets = {
             "type": "number",
             "label": "Length (Meters)"
         },
+        "level": {
+            "key": "level",
+            "type": "combo",
+            "label": "Level",
+            "universal": true
+        },
         "levels": {
             "key": "building:levels",
             "type": "number",
@@ -39249,6 +40317,25 @@ iD.data.presets = {
             "label": "Speed Limit",
             "placeholder": "40, 50, 60..."
         },
+        "maxstay": {
+            "key": "maxstay",
+            "type": "combo",
+            "label": "Max Stay",
+            "options": [
+                "15 min",
+                "30 min",
+                "45 min",
+                "1 hr",
+                "1.5 hr",
+                "2 hr",
+                "2.5 hr",
+                "3 hr",
+                "4 hr",
+                "1 day",
+                "2 day"
+            ],
+            "snake_case": false
+        },
         "mtb/scale": {
             "key": "mtb:scale",
             "type": "combo",
@@ -39459,6 +40546,11 @@ iD.data.presets = {
             "type": "typeCombo",
             "label": "Type"
         },
+        "power_supply": {
+            "key": "power_supply",
+            "type": "check",
+            "label": "Power Supply"
+        },
         "railway": {
             "key": "railway",
             "type": "typeCombo",
@@ -39479,11 +40571,32 @@ iD.data.presets = {
             "type": "check",
             "label": "Accepts Glass"
         },
+        "recycling/glass_bottles": {
+            "key": "recycling:glass_bottles",
+            "type": "check",
+            "label": "Accepts Glass Bottles"
+        },
         "recycling/paper": {
             "key": "recycling:paper",
             "type": "check",
             "label": "Accepts Paper"
         },
+        "recycling/plastic": {
+            "key": "recycling:plastic",
+            "type": "check",
+            "label": "Accepts Plastic"
+        },
+        "recycling/type": {
+            "key": "recycling_type",
+            "type": "combo",
+            "label": "Recycling Type",
+            "strings": {
+                "options": {
+                    "container": "Container",
+                    "centre": "Recycling Center"
+                }
+            }
+        },
         "ref": {
             "key": "ref",
             "type": "text",
@@ -39539,6 +40652,11 @@ iD.data.presets = {
                 }
             }
         },
+        "sanitary_dump_station": {
+            "key": "sanitary_dump_station",
+            "type": "check",
+            "label": "Toilet Disposal"
+        },
         "seasonal": {
             "key": "seasonal",
             "type": "check",
@@ -39556,8 +40674,8 @@ iD.data.presets = {
                 "drive-through"
             ]
         },
-        "service/bicycle/chaintool": {
-            "key": "service:bicycle:chaintool",
+        "service/bicycle/chain_tool": {
+            "key": "service:bicycle:chain_tool",
             "type": "check",
             "label": "Chain Tool",
             "strings": {
@@ -39580,6 +40698,19 @@ iD.data.presets = {
                 }
             }
         },
+        "service_rail": {
+            "key": "service",
+            "type": "combo",
+            "label": "Service Type",
+            "strings": {
+                "options": {
+                    "spur": "Spur",
+                    "yard": "Yard",
+                    "siding": "Siding",
+                    "crossover": "Crossover"
+                }
+            }
+        },
         "shelter": {
             "key": "shelter",
             "type": "check",
@@ -39795,6 +40926,12 @@ iD.data.presets = {
                 }
             }
         },
+        "traffic_signals": {
+            "key": "traffic_signals",
+            "type": "combo",
+            "label": "Type",
+            "default": "signal"
+        },
         "trail_visibility": {
             "key": "trail_visibility",
             "type": "combo",
@@ -39831,6 +40968,11 @@ iD.data.presets = {
             "type": "combo",
             "label": "Type"
         },
+        "water_point": {
+            "key": "water_point",
+            "type": "check",
+            "label": "Water Point"
+        },
         "waterway": {
             "key": "waterway",
             "type": "typeCombo",