diff --git a/css/20_map.css b/css/20_map.css
index 13c72a12b..def29ff99 100644
--- a/css/20_map.css
+++ b/css/20_map.css
@@ -265,6 +265,18 @@ text.point {
     opacity: 0.8;
 }
 
+/* Highlighting */
+
+g.point.highlighted .shadow,
+path.shadow.highlighted {
+    stroke-opacity: 0.95;
+    stroke: #7092ff;
+}
+g.vertex.highlighted .shadow {
+    stroke-width: 7;
+    stroke-opacity: 0.95;
+    stroke: #7092ff;
+}
 
 /* Turn Restrictions */
 
diff --git a/css/45_waterways.css b/css/45_waterways.css
index fb71ec09b..41f954db3 100644
--- a/css/45_waterways.css
+++ b/css/45_waterways.css
@@ -4,7 +4,6 @@
     fill: #77d3de;
 }
 .preset-icon .icon.iD-category-water,
-.preset-icon .icon.tag-route-ferry,
 .preset-icon .icon.tag-type-waterway,
 .preset-icon .icon.tag-waterway {
     color: #77d3de;
@@ -95,3 +94,26 @@ path.area.fill.tag-waterway-fuel {
     fill: rgba(255, 255, 255, 0.3);
 }
 
+/* ferry routes  */
+.preset-icon .icon.tag-route-ferry {
+    color: #58a9ed;
+    fill: #fff;
+}
+path.shadow.tag-route-ferry {
+    stroke-width: 16;
+}
+path.stroke.tag-route-ferry {
+    stroke-width: 3;
+    stroke-linecap: butt;
+    stroke-dasharray: 12,8;
+}
+.low-zoom path.shadow.tag-route-ferry {
+    stroke-width: 12;
+}
+.low-zoom path.stroke.tag-route-ferry {
+    stroke-width: 2;
+    stroke-dasharray: 6,4;
+}
+path.stroke.tag-route-ferry {
+    stroke: #58a9ed;
+}
diff --git a/css/50_misc.css b/css/50_misc.css
index e74ec4b7d..7fefafc97 100644
--- a/css/50_misc.css
+++ b/css/50_misc.css
@@ -1,10 +1,12 @@
-/* power */
+/* power and pipeline */
 .preset-icon .icon.tag-man_made-pipeline,
 .preset-icon .icon.tag-power {
     color: #939393;
     fill: #939393;
 }
 
+/* power */
+
 path.stroke.tag-power {
     stroke: #939393;
     stroke-width: 2;
@@ -13,6 +15,21 @@ path.casing.tag-power {
     stroke: none;
 }
 
+/* pipeline */
+
+path.stroke.tag-man_made-pipeline {
+    stroke: #CBD0D8;
+    stroke-linecap: butt;
+    stroke-width: 3;
+    stroke-dasharray: 80, 1.25;
+}
+path.casing.tag-man_made-pipeline {
+    stroke: #666;
+    stroke-width: 4.5;
+}
+.low-zoom path.stroke.tag-man_made-pipeline {
+    stroke-dasharray: 40, 1;
+}
 
 /* boundaries */
 path.stroke.tag-boundary {
@@ -145,10 +162,14 @@ path.casing.tag-highway-bridleway.tag-bridge {
 
 
 /* tunnels */
-path.stroke.tag-tunnel {
+path.stroke.tag-tunnel,
+path.line.stroke.tag-location-underground,
+path.line.stroke.tag-location-underwater {
     stroke-opacity: 0.3;
 }
-path.casing.tag-tunnel {
+path.casing.tag-tunnel,
+path.line.casing.tag-location-underground,
+path.line.stroke.tag-location-underwater {
     stroke-opacity: 0.5;
     stroke-linecap: butt;
     stroke-dasharray: none;
@@ -218,6 +239,7 @@ path.fill.tag-building {
     stroke: rgba(224, 110, 95, 0.3);
     fill: rgba(224, 110, 95, 0.3);
 }
+.preset-icon-fill-area.tag-parking-multi-storey,
 .preset-icon-fill-area.tag-building {
     border-color: rgb(224, 110, 95);
     background-color: rgba(224, 110, 95, 0.3);
diff --git a/css/80_app.css b/css/80_app.css
index 6b3047bcd..307eafdfb 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -902,6 +902,18 @@ a.hide-toggle {
     border-radius: 0;
 }
 
+.geocode-item {
+    width: 50%;
+    background-color: #ccc;
+    left: 25%;
+    margin-top: 30px;
+    border-radius: 2px;
+}
+
+.geocode-item:hover {
+    background-color: #aaa;
+}
+
 .feature-list-item {
     background-color: #fff;
     font-weight: bold;
@@ -1117,7 +1129,8 @@ a.hide-toggle {
     border-radius: 3px 0 0 3px;
 }
 
-.preset-list-button:hover .label {
+.preset-list-button:hover .label,
+.preset-list-button:focus .label {
     background-color: #ececec;
 }
 
@@ -1240,12 +1253,11 @@ a.hide-toggle {
     top: 0;
     right: 0;
     height: 100%;
-    width: 100%;
     background: transparent;
-    text-align: right;
 }
 [dir='rtl'] .form-label-button-wrap {
-    text-align: left;
+    right: auto;
+    left: 0;
 }
 
 .form-label-button-wrap .tag-reference-button {
diff --git a/data/core.yaml b/data/core.yaml
index 5472f81d1..55b846840 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -1,8 +1,10 @@
 en:
   icons:
+    download: download
     information: info
     remove: remove
     undo: undo
+    zoom_to: zoom to
   modes:
     add_area:
       title: Area
diff --git a/data/presets.yaml b/data/presets.yaml
index a009d318f..2af2265ca 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -25,6 +25,8 @@ en:
         name: Road Features
       category-route:
         name: Route Features
+      category-utility:
+        name: Utility Features
       category-water-area:
         name: Water Features
       category-water-line:
@@ -323,7 +325,7 @@ en:
         label: Collection Times
       colour:
         # colour=*
-        label: Colour
+        label: Color
       comment:
         # comment=*
         label: Changeset Comment
@@ -631,6 +633,9 @@ en:
       frequency:
         # frequency=*
         label: Operating Frequency
+      from:
+        # from=*
+        label: From
       fuel:
         # fuel=*
         label: Fuel
@@ -1299,28 +1304,6 @@ en:
           sleigh: Sleigh
           # 'piste:type=snow_park'
           snow_park: Snow Park
-      piste/type_downhill:
-        # 'piste:type=*'
-        label: Type
-        options:
-          # 'piste:type=connection'
-          connection: Connection between pistes
-          # 'piste:type=downhill'
-          downhill: Downhill
-          # 'piste:type=playground'
-          playground: Playground
-          # 'piste:type=snow_park'
-          snow_park: Snow Park
-      piste/type_nordic:
-        # 'piste:type=*'
-        label: Type
-        options:
-          # 'piste:type=connection'
-          connection: Connection between pistes
-          # 'piste:type=downhill'
-          downhill: Nordic
-          # 'piste:type=playground'
-          playground: Playground
       place:
         # place=*
         label: Type
@@ -1491,7 +1474,7 @@ en:
           waterway_right: Waterway Right
       seamark/beacon_lateral/colour:
         # 'seamark:beacon_lateral:colour=*'
-        label: Colour
+        label: Color
         options:
           # 'seamark:beacon_lateral:colour=green'
           green: Green
@@ -1540,7 +1523,7 @@ en:
           waterway_right: Waterway Right
       seamark/buoy_lateral/colour:
         # 'seamark:buoy_lateral:colour=*'
-        label: Colour
+        label: Color
         options:
           # 'seamark:buoy_lateral:colour=green'
           green: Green
@@ -1585,6 +1568,11 @@ en:
       seasonal:
         # seasonal=*
         label: Seasonal
+      seats:
+        # seats=*
+        label: Seats
+        # seats field placeholder
+        placeholder: '2, 4, 6...'
       second_hand:
         # second_hand=*
         label: Sells Used
@@ -1815,6 +1803,9 @@ en:
           'yes': 'Yes'
         # takeaway field placeholder
         placeholder: 'Yes, No, Takeaway Only...'
+      to:
+        # to=*
+        label: To
       toilets/disposal:
         # 'toilets:disposal=*'
         label: Disposal
@@ -2462,13 +2453,14 @@ en:
         name: Nursing Home
       amenity/parking:
         # amenity=parking
-        name: Car Parking
-        terms: '<translate with synonyms or related terms for ''Car Parking'', separated by commas>'
+        name: Parking Lot
+        # 'terms: car,parking lot'
+        terms: '<translate with synonyms or related terms for ''Parking Lot'', separated by commas>'
       amenity/parking/multi-storey:
         # 'amenity=parking, parking=multi-storey'
-        name: Multilevel Car Parking
-        # 'terms: multistorey car park,parking garage,parkade,parking structure,parking ramp,parking deck,parking building,indoor parking'
-        terms: '<translate with synonyms or related terms for ''Multilevel Car Parking'', separated by commas>'
+        name: Multilevel Parking Garage
+        # 'terms: car,indoor parking,multistorey car park,parkade,parking building,parking deck,parking garage,parking ramp,parking structure'
+        terms: '<translate with synonyms or related terms for ''Multilevel Parking Garage'', separated by commas>'
       amenity/parking_entrance:
         # amenity=parking_entrance
         name: Parking Garage Entrance/Exit
@@ -2966,13 +2958,13 @@ en:
         terms: '<translate with synonyms or related terms for ''Hedge'', separated by commas>'
       barrier/kerb:
         # barrier=kerb
-        name: Kerb
-        terms: '<translate with synonyms or related terms for ''Kerb'', separated by commas>'
+        name: Curb
+        terms: '<translate with synonyms or related terms for ''Curb'', separated by commas>'
       barrier/kerb/lowered:
         # 'barrier=kerb, kerb=lowered'
-        name: Lowered Kerb
+        name: Lowered Curb
         # 'terms: curb cut,curb ramp,kerb ramp,dropped kerb,pram ramp'
-        terms: '<translate with synonyms or related terms for ''Lowered Kerb'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Lowered Curb'', separated by commas>'
       barrier/kissing_gate:
         # barrier=kissing_gate
         name: Kissing Gate
@@ -4608,6 +4600,7 @@ en:
       man_made/pipeline:
         # man_made=pipeline
         name: Pipeline
+        # 'terms: oil,natural gas,water,sewer,sewage'
         terms: '<translate with synonyms or related terms for ''Pipeline'', separated by commas>'
       man_made/pumping_station:
         # man_made=pumping_station
@@ -5052,6 +5045,10 @@ en:
         # place=city
         name: City
         terms: '<translate with synonyms or related terms for ''City'', separated by commas>'
+      place/city_block:
+        # place=city_block
+        name: City Block
+        terms: '<translate with synonyms or related terms for ''City Block'', separated by commas>'
       place/farm:
         # place=farm
         name: Farm
@@ -5175,17 +5172,26 @@ en:
       power:
         # power=*
         name: Power
+      power/cable/underground:
+        # 'power=cable, location=underground'
+        name: Underground Power Cable
+        terms: '<translate with synonyms or related terms for ''Underground Power Cable'', separated by commas>'
       power/generator:
         # power=generator
         name: Power Generator
         # 'terms: hydro,solar,turbine,wind'
         terms: '<translate with synonyms or related terms for ''Power Generator'', separated by commas>'
-      power/generator/source_nuclear:
+      power/generator/method/photovoltaic:
+        # 'power=generator, generator:source=solar, generator:method=photovoltaic, generator:type=solar_photovoltaic_panel'
+        name: Solar Panel
+        # 'terms: photovoltaic module,PV module,sunlight'
+        terms: '<translate with synonyms or related terms for ''Solar Panel'', separated by commas>'
+      power/generator/source/nuclear:
         # 'power=generator, generator:source=nuclear, generator:method=fission'
         name: Nuclear Reactor
         # 'terms: fission,generator,nuclear,nuke,reactor'
         terms: '<translate with synonyms or related terms for ''Nuclear Reactor'', separated by commas>'
-      power/generator/source_wind:
+      power/generator/source/wind:
         # 'power=generator, generator:source=wind, generator:method=wind_turbine'
         name: Wind Turbine
         # 'terms: generator,turbine,windmill,wind'
diff --git a/data/presets/README.md b/data/presets/README.md
index 24df5b0e8..d9b4fa0ac 100644
--- a/data/presets/README.md
+++ b/data/presets/README.md
@@ -210,6 +210,21 @@ the user can not type their own value, they must choose one of the given values.
 If a combo field does not specify `options` or `strings`, the field will fetch
 common tag values from the Taginfo service to use as dropdown values.
 
+##### `snake_case`
+
+For combo fields, spaces are replaced with underscores in the tag value if `snake_case` is `true`. The default is `true`.
+
+##### `caseSensitive`
+
+For combo fields, case-sensitve field values are allowed if `caseSensitive` is `true`. The default is `false`.
+
+##### `min_value`
+
+For number fields, the lowest valid value. There is no default.
+
+##### `max_value`
+
+For number fields, the greatest valid value. There is no default.
 
 ## Icons
 
diff --git a/data/presets/categories.json b/data/presets/categories.json
index af19ba230..c1a7c16a0 100644
--- a/data/presets/categories.json
+++ b/data/presets/categories.json
@@ -22,6 +22,7 @@
         "building",
         "building/house",
         "building/apartments",
+        "building/garage",
         "building/retail",
         "building/commercial",
         "building/industrial",
@@ -186,6 +187,17 @@
         "type/route"
       ]
     },
+    "category-utility": {
+      "icon": "iD-category-utility",
+      "geometry": "line",
+      "name": "Utility Features",
+      "members": [
+        "power/line",
+        "power/minor_line",
+        "man_made/pipeline",
+        "power/cable/underground"
+      ]
+    },
     "category-water-area": {
       "icon": "maki-water",
       "geometry": "area",
diff --git a/data/presets/categories/building.json b/data/presets/categories/building.json
index a85736bb8..05a116721 100644
--- a/data/presets/categories/building.json
+++ b/data/presets/categories/building.json
@@ -6,6 +6,7 @@
         "building",
         "building/house",
         "building/apartments",
+        "building/garage",
         "building/retail",
         "building/commercial",
         "building/industrial",
diff --git a/data/presets/categories/utility.json b/data/presets/categories/utility.json
new file mode 100644
index 000000000..63aae92d0
--- /dev/null
+++ b/data/presets/categories/utility.json
@@ -0,0 +1,11 @@
+{
+    "icon": "iD-category-utility",
+    "geometry": "line",
+    "name": "Utility Features",
+    "members": [
+        "power/line",
+        "power/minor_line",
+        "man_made/pipeline",
+        "power/cable/underground"
+    ]
+}
diff --git a/data/presets/defaults.json b/data/presets/defaults.json
index b0c9e52ef..a6db43d57 100644
--- a/data/presets/defaults.json
+++ b/data/presets/defaults.json
@@ -19,7 +19,7 @@
       "category-water-line",
       "category-barrier",
       "category-natural-line",
-      "power/line",
+      "category-utility",
       "line"
     ],
     "point": [
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 801eb4d74..a16c79ab8 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -53,7 +53,7 @@
     "clothes": {"key": "clothes", "type": "semiCombo", "label": "Clothes"},
     "club": {"key": "club", "type": "typeCombo", "label": "Type"},
     "collection_times": {"key": "collection_times", "type": "text", "label": "Collection Times"},
-    "colour": {"key": "colour", "type": "text", "label": "Colour"},
+    "colour": {"key": "colour", "type": "text", "label": "Color"},
     "comment": {"key": "comment", "type": "textarea", "label": "Changeset Comment", "placeholder": "Brief description of your contributions (required)"},
     "communication_multi": {"key": "communication:", "type": "multiCombo", "label": "Communication Types"},
     "construction": {"key": "construction", "type": "combo", "label": "Type"},
@@ -109,12 +109,13 @@
     "flag/type": {"key": "flag:type", "type": "combo", "label": "Flag Type"},
     "ford": {"key": "ford", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
     "frequency": {"key": "frequency", "type": "combo", "label": "Operating Frequency"},
+    "from": {"key": "from", "type": "text", "label": "From"},
     "fuel_multi": {"key": "fuel:", "type": "multiCombo", "label": "Fuel Types"},
     "fuel": {"key": "fuel", "type": "combo", "label": "Fuel"},
     "gauge": {"key": "gauge", "type": "combo", "label": "Gauge"},
     "gender": {"type": "radio", "keys": ["male", "female", "unisex"], "label": "Gender", "placeholder": "Unknown", "strings": {"options": {"male": "Male", "female": "Female", "unisex": "Unisex"}}},
     "generator/method": {"key": "generator:method", "type": "combo", "label": "Method"},
-    "generator/output/electricity": {"key": "generator:output:electricity", "type": "text", "label": "Power Output", "placeholder": "50 MW, 100 MW, 200 MW..."},
+    "generator/output/electricity": {"key": "generator:output:electricity", "type": "typeCombo", "label": "Power Output", "placeholder": "50 MW, 100 MW, 200 MW...", "snake_case": false},
     "generator/source": {"key": "generator:source", "type": "combo", "label": "Source"},
     "generator/type": {"key": "generator:type", "type": "combo", "label": "Type"},
     "government": {"key": "government", "type": "typeCombo", "label": "Type"},
@@ -210,8 +211,6 @@
     "piste/grooming_hike": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic - Winter Hiking", "backcountry": "Backcountry - Snowshoeing"}}},
     "piste/grooming_nordic": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic", "backcountry": "Backcountry, no grooming", "classic+skating": "Classic and Skating", "scooter": "Scooter/Snowmobile", "skating": "Skating"}}},
     "piste/grooming": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic", "mogul": "Mogul", "backcountry": "Backcountry", "classic+skating": "Classic and Skating", "scooter": "Scooter/Snowmobile", "skating": "Skating"}}},
-    "piste/type_downhill": {"key": "piste:type", "type": "typeCombo", "label": "Type", "strings": {"options": {"downhill": "Downhill", "snow_park": "Snow Park", "playground": "Playground", "connection": "Connection between pistes"}}},
-    "piste/type_nordic": {"key": "piste:type", "type": "typeCombo", "label": "Type", "strings": {"options": {"downhill": "Nordic", "playground": "Playground", "connection": "Connection between pistes"}}},
     "piste/type": {"key": "piste:type", "type": "typeCombo", "label": "Type", "strings": {"options": {"downhill": "Downhill", "nordic": "Nordic", "skitour": "Skitour", "sled": "Sled", "hike": "Hike", "sleigh": "Sleigh", "ice_skate": "Ice Skate", "snow_park": "Snow Park", "playground": "Playground", "connection": "Connection"}}},
     "place": {"key": "place", "type": "typeCombo", "label": "Type"},
     "plant": {"key": "plant", "type": "combo", "label": "Plant"},
@@ -252,17 +251,18 @@
     "sanitary_dump_station": {"key": "sanitary_dump_station", "type": "check", "label": "Toilet Disposal"},
     "seamark/beacon_isolated_danger/shape": {"key": "seamark:beacon_isolated_danger:shape", "type": "combo", "label": "Shape"},
     "seamark/beacon_lateral/category": {"key": "seamark:beacon_lateral:category", "type": "combo", "label": "Category", "strings": {"options": {"port": "Port", "starboard": "Starboard", "waterway_left": "Waterway Left", "waterway_right": "Waterway Right", "danger_left": "Danger Left", "danger_right": "Danger Right"}}},
-    "seamark/beacon_lateral/colour": {"key": "seamark:beacon_lateral:colour", "type": "combo", "label": "Colour", "strings": {"options": {"red": "Red", "green": "Green", "grey": "Grey"}}},
+    "seamark/beacon_lateral/colour": {"key": "seamark:beacon_lateral:colour", "type": "combo", "label": "Color", "strings": {"options": {"red": "Red", "green": "Green", "grey": "Grey"}}},
     "seamark/beacon_lateral/shape": {"key": "seamark:beacon_lateral:shape", "type": "combo", "label": "Shape"},
     "seamark/beacon_lateral/system": {"key": "seamark:beacon_lateral:system", "type": "combo", "label": "System", "strings": {"options": {"iala-a": "IALA A", "iala-b": "IALA B", "cevni": "CEVNI", "other": "Other"}}},
     "seamark/buoy_lateral/category": {"key": "seamark:buoy_lateral:category", "type": "combo", "label": "Category", "strings": {"options": {"port": "Port", "starboard": "Starboard", "channel_left": "Channel Left", "channel_right": "Channel Right", "waterway_left": "Waterway Left", "waterway_right": "Waterway Right", "danger_left": "Danger Left", "danger_right": "Danger Right", "preferred_channel_port": "Preferred Channel Port", "preferred_channel_starboard": "Preferred Channel Starboard"}}},
-    "seamark/buoy_lateral/colour": {"key": "seamark:buoy_lateral:colour", "type": "combo", "label": "Colour", "strings": {"options": {"red": "Red", "green": "Green", "red;white;red;white": "Red-White-Red-White", "green;white;green;white": "Green-White-Green-White", "red;green;red": "Red-Green-Red", "green;red;green": "Green-Red-Green", "white": "White", "yellow": "Yellow"}}},
+    "seamark/buoy_lateral/colour": {"key": "seamark:buoy_lateral:colour", "type": "combo", "label": "Color", "strings": {"options": {"red": "Red", "green": "Green", "red;white;red;white": "Red-White-Red-White", "green;white;green;white": "Green-White-Green-White", "red;green;red": "Red-Green-Red", "green;red;green": "Green-Red-Green", "white": "White", "yellow": "Yellow"}}},
     "seamark/buoy_lateral/shape": {"key": "seamark:buoy_lateral:shape", "type": "combo", "label": "Shape"},
     "seamark/buoy_lateral/system": {"key": "seamark:buoy_lateral:system", "type": "combo", "label": "System", "strings": {"options": {"iala-a": "IALA A", "iala-b": "IALA B", "cevni": "CEVNI", "other": "Other"}}},
     "seamark/mooring/category": {"key": "seamark:mooring:category", "type": "combo", "label": "Category"},
     "seamark/type": {"key": "seamark:type", "type": "combo", "universal": true, "label": "Seamark"},
     "seamark/wreck/category": {"key": "seamark:wreck:category", "type": "combo", "label": "Category"},
     "seasonal": {"key": "seasonal", "type": "check", "label": "Seasonal"},
+    "seats": {"key": "seats", "type": "number", "minValue": 0, "label": "Seats", "placeholder": "2, 4, 6..."},
     "second_hand": {"key": "second_hand", "type": "combo", "label": "Sells Used", "placeholder": "Yes, No, Only", "strings": {"options": {"yes": "Yes", "no": "No", "only": "Only"}}},
     "service_rail": {"key": "service", "type": "combo", "label": "Service Type", "strings": {"options": {"spur": "Spur", "yard": "Yard", "siding": "Siding", "crossover": "Crossover"}}},
     "service_times": {"key": "service_times", "type": "text", "label": "Service Times"},
@@ -304,6 +304,7 @@
     "switch": {"key": "switch", "type": "combo", "label": "Type", "strings": {"options": {"mechanical": "Mechanical", "circuit_breaker": "Circuit Breaker", "disconnector": "Disconnector", "earthing": "Earthing"}}},
     "tactile_paving": {"key": "tactile_paving", "type": "check", "label": "Tactile Paving"},
     "takeaway": {"key": "takeaway", "type": "combo", "label": "Takeaway", "placeholder": "Yes, No, Takeaway Only...", "strings": {"options": {"yes": "Yes", "no": "No", "only": "Takeaway Only"}}},
+    "to": {"key": "to", "type": "text", "label": "To"},
     "toilets/disposal": {"key": "toilets:disposal", "type": "combo", "label": "Disposal", "strings": {"options": {"flush": "Flush", "pitlatrine": "Pit/Latrine", "chemical": "Chemical", "bucket": "Bucket"}}},
     "toll": {"key": "toll", "type": "check", "label": "Toll"},
     "tomb": {"key": "tomb", "type": "typeCombo", "label": "Type"},
diff --git a/data/presets/fields/colour.json b/data/presets/fields/colour.json
index 6ab9de9af..d53e2a950 100644
--- a/data/presets/fields/colour.json
+++ b/data/presets/fields/colour.json
@@ -1,5 +1,5 @@
 {
     "key": "colour",
     "type": "text",
-    "label": "Colour"
+    "label": "Color"
 }
diff --git a/data/presets/fields/from.json b/data/presets/fields/from.json
new file mode 100644
index 000000000..5a96cc469
--- /dev/null
+++ b/data/presets/fields/from.json
@@ -0,0 +1,5 @@
+{
+    "key": "from",
+    "type": "text",
+    "label": "From"
+}
\ No newline at end of file
diff --git a/data/presets/fields/generator/output/electricity.json b/data/presets/fields/generator/output/electricity.json
index 50bc4cfd2..01efca521 100644
--- a/data/presets/fields/generator/output/electricity.json
+++ b/data/presets/fields/generator/output/electricity.json
@@ -1,6 +1,7 @@
 {
     "key": "generator:output:electricity",
-    "type": "text",
+    "type": "typeCombo",
     "label": "Power Output",
-    "placeholder": "50 MW, 100 MW, 200 MW..."
+    "placeholder": "50 MW, 100 MW, 200 MW...",
+    "snake_case": false
 }
diff --git a/data/presets/fields/piste/type_downhill.json b/data/presets/fields/piste/type_downhill.json
deleted file mode 100644
index 597f838e2..000000000
--- a/data/presets/fields/piste/type_downhill.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "key": "piste:type",
-    "type": "typeCombo",
-    "label": "Type",
-    "strings": {
-        "options": {
-            "downhill": "Downhill",
-            "snow_park": "Snow Park",
-            "playground": "Playground",
-            "connection": "Connection between pistes"
-        }
-    }
-}
diff --git a/data/presets/fields/piste/type_nordic.json b/data/presets/fields/piste/type_nordic.json
deleted file mode 100644
index 2065421f4..000000000
--- a/data/presets/fields/piste/type_nordic.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "key": "piste:type",
-    "type": "typeCombo",
-    "label": "Type",
-    "strings": {
-        "options": {
-            "downhill": "Nordic",
-            "playground": "Playground",
-            "connection": "Connection between pistes"
-        }
-    }
-}
diff --git a/data/presets/fields/seamark/beacon_lateral/colour.json b/data/presets/fields/seamark/beacon_lateral/colour.json
index 2af53b30e..94c35483c 100644
--- a/data/presets/fields/seamark/beacon_lateral/colour.json
+++ b/data/presets/fields/seamark/beacon_lateral/colour.json
@@ -1,7 +1,7 @@
 {
     "key": "seamark:beacon_lateral:colour",
     "type": "combo",
-    "label": "Colour",
+    "label": "Color",
     "strings": {
         "options": {
             "red": "Red",
diff --git a/data/presets/fields/seamark/buoy_lateral/colour.json b/data/presets/fields/seamark/buoy_lateral/colour.json
index abe96b049..e95c4363e 100644
--- a/data/presets/fields/seamark/buoy_lateral/colour.json
+++ b/data/presets/fields/seamark/buoy_lateral/colour.json
@@ -1,7 +1,7 @@
 {
     "key": "seamark:buoy_lateral:colour",
     "type": "combo",
-    "label": "Colour",
+    "label": "Color",
     "strings": {
         "options": {
             "red": "Red",
diff --git a/data/presets/fields/seats.json b/data/presets/fields/seats.json
new file mode 100644
index 000000000..e9655f895
--- /dev/null
+++ b/data/presets/fields/seats.json
@@ -0,0 +1,7 @@
+{
+    "key": "seats",
+    "type": "number",
+    "minValue": 0,
+    "label": "Seats",
+    "placeholder": "2, 4, 6..."
+}
diff --git a/data/presets/fields/to.json b/data/presets/fields/to.json
new file mode 100644
index 000000000..b95ac745d
--- /dev/null
+++ b/data/presets/fields/to.json
@@ -0,0 +1,5 @@
+{
+    "key": "to",
+    "type": "text",
+    "label": "To"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 4b8cab7d3..0663c97de 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -51,14 +51,14 @@
     "amenity/bank": {"icon": "maki-bank", "fields": ["name", "atm", "operator", "address", "building_area", "opening_hours", "drive_through"], "geometry": ["point", "area"], "terms": ["credit union", "check", "deposit", "fund", "investment", "repository", "reserve", "safe", "savings", "stock", "treasury", "trust", "vault"], "tags": {"amenity": "bank"}, "name": "Bank"},
     "amenity/bar": {"icon": "maki-bar", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking", "outdoor_seating", "brewery"], "geometry": ["point", "area"], "terms": ["dive", "beer", "bier", "booze"], "tags": {"amenity": "bar"}, "name": "Bar"},
     "amenity/bbq": {"icon": "maki-bbq", "fields": ["covered", "fuel", "access_simple"], "geometry": ["point"], "terms": ["bbq", "grill"], "tags": {"amenity": "bbq"}, "name": "Barbecue/Grill"},
-    "amenity/bench": {"icon": "temaki-bench", "fields": ["backrest"], "geometry": ["point", "vertex", "line"], "terms": ["seat"], "tags": {"amenity": "bench"}, "name": "Bench"},
+    "amenity/bench": {"icon": "temaki-bench", "fields": ["backrest", "material", "seats", "colour"], "geometry": ["point", "vertex", "line"], "terms": ["seat"], "tags": {"amenity": "bench"}, "name": "Bench"},
     "amenity/bicycle_parking": {"icon": "maki-bicycle", "fields": ["bicycle_parking", "capacity", "operator", "covered", "access_simple"], "geometry": ["point", "vertex", "area"], "terms": ["bike"], "tags": {"amenity": "bicycle_parking"}, "name": "Bicycle Parking"},
     "amenity/bicycle_rental": {"icon": "maki-bicycle", "fields": ["capacity", "network", "operator", "payment_multi"], "geometry": ["point", "vertex", "area"], "terms": ["bike"], "tags": {"amenity": "bicycle_rental"}, "name": "Bicycle Rental"},
     "amenity/bicycle_repair_station": {"icon": "maki-bicycle", "fields": ["operator", "brand", "opening_hours", "fee", "service/bicycle"], "geometry": ["point", "vertex"], "terms": ["bike", "repair", "chain", "pump"], "tags": {"amenity": "bicycle_repair_station"}, "name": "Bicycle Repair Tool Stand"},
     "amenity/biergarten": {"icon": "maki-beer", "fields": ["name", "address", "building", "opening_hours", "smoking", "outdoor_seating", "brewery"], "geometry": ["point", "area"], "tags": {"amenity": "biergarten"}, "terms": ["beer", "bier", "booze"], "name": "Biergarten"},
     "amenity/boat_rental": {"fields": ["name", "operator", "payment_multi"], "geometry": ["point", "area"], "tags": {"amenity": "boat_rental"}, "name": "Boat Rental"},
     "amenity/bureau_de_change": {"icon": "maki-bank", "fields": ["name", "currency_multi", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["bureau de change", "money changer"], "tags": {"amenity": "bureau_de_change"}, "name": "Currency Exchange"},
-    "amenity/cafe": {"icon": "maki-cafe", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
+    "amenity/cafe": {"icon": "maki-cafe", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
     "amenity/car_pooling": {"icon": "maki-car", "fields": ["name", "operator", "capacity"], "geometry": ["point", "area"], "tags": {"amenity": "car_pooling"}, "name": "Car Pooling"},
     "amenity/car_rental": {"icon": "maki-car", "fields": ["name", "operator", "payment_multi"], "geometry": ["point", "area"], "tags": {"amenity": "car_rental"}, "name": "Car Rental"},
     "amenity/car_sharing": {"icon": "maki-car", "fields": ["name", "operator", "capacity", "payment_multi"], "geometry": ["point", "area"], "tags": {"amenity": "car_sharing"}, "name": "Car Sharing"},
@@ -104,8 +104,8 @@
     "amenity/nightclub": {"icon": "maki-bar", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking"], "geometry": ["point", "area"], "tags": {"amenity": "nightclub"}, "terms": ["disco*", "night club", "dancing", "dance club"], "name": "Nightclub"},
     "amenity/parking_entrance": {"icon": "maki-entrance-alt1", "fields": ["access_simple", "ref"], "geometry": ["vertex"], "tags": {"amenity": "parking_entrance"}, "name": "Parking Garage Entrance/Exit"},
     "amenity/parking_space": {"fields": ["capacity"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "parking_space"}, "matchScore": 0.95, "name": "Parking Space"},
-    "amenity/parking": {"icon": "maki-parking", "fields": ["name", "operator", "parking", "capacity", "fee", "access_simple", "supervised", "park_ride", "surface", "maxstay"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking"}, "terms": [], "name": "Car Parking"},
-    "amenity/parking/multi-storey": {"icon": "maki-parking-garage", "fields": ["name", "building", "levels", "height", "address"], "geometry": ["area"], "terms": ["multistorey car park", "parking garage", "parkade", "parking structure", "parking ramp", "parking deck", "parking building", "indoor parking"], "tags": {"amenity": "parking", "parking": "multi-storey"}, "addTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "removeTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "reference": {"key": "parking", "value": "multi-storey"}, "name": "Multilevel Car Parking"},
+    "amenity/parking": {"icon": "maki-car", "fields": ["name", "operator", "parking", "capacity", "fee", "access_simple", "supervised", "park_ride", "surface", "maxstay"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking"}, "terms": ["car", "parking lot"], "name": "Parking Lot"},
+    "amenity/parking/multi-storey": {"icon": "maki-car", "fields": ["name", "operator", "building", "levels", "height", "address", "capacity", "fee", "access_simple"], "geometry": ["area"], "tags": {"amenity": "parking", "parking": "multi-storey"}, "addTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "removeTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "reference": {"key": "parking", "value": "multi-storey"}, "terms": ["car", "indoor parking", "multistorey car park", "parkade", "parking building", "parking deck", "parking garage", "parking ramp", "parking structure"], "name": "Multilevel Parking Garage"},
     "amenity/pharmacy": {"icon": "maki-pharmacy", "fields": ["name", "operator", "address", "building_area", "drive_through", "opening_hours", "payment_multi", "dispensing"], "geometry": ["point", "area"], "tags": {"amenity": "pharmacy"}, "addTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "removeTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "terms": ["apothecary", "drug*", "med*", "prescription"], "name": "Pharmacy"},
     "amenity/place_of_worship": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area", "service_times"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship"}, "name": "Place of Worship"},
     "amenity/place_of_worship/buddhist": {"icon": "maki-buddhism", "fields": ["name", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["stupa", "vihara", "monastery", "temple", "pagoda", "zendo", "dojo"], "tags": {"amenity": "place_of_worship", "religion": "buddhist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Buddhist Temple"},
@@ -206,8 +206,8 @@
     "barrier/fence": {"icon": "maki-fence", "fields": ["fence_type", "height"], "geometry": ["line"], "tags": {"barrier": "fence"}, "name": "Fence", "matchScore": 0.25},
     "barrier/gate": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "gate"}, "name": "Gate"},
     "barrier/hedge": {"fields": ["height"], "geometry": ["line", "area"], "tags": {"barrier": "hedge"}, "name": "Hedge", "matchScore": 0.25},
-    "barrier/kerb": {"icon": "maki-wheelchair", "fields": ["kerb", "tactile_paving"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb"}, "name": "Kerb"},
-    "barrier/kerb/lowered": {"icon": "maki-wheelchair", "fields": ["kerb", "tactile_paving"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "lowered"}, "reference": {"key": "kerb", "value": "lowered"}, "terms": ["curb cut", "curb ramp", "kerb ramp", "dropped kerb", "pram ramp"], "name": "Lowered Kerb"},
+    "barrier/kerb": {"icon": "maki-wheelchair", "fields": ["kerb", "tactile_paving"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb"}, "name": "Curb"},
+    "barrier/kerb/lowered": {"icon": "maki-wheelchair", "fields": ["kerb", "tactile_paving"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "lowered"}, "reference": {"key": "kerb", "value": "lowered"}, "terms": ["curb cut", "curb ramp", "kerb ramp", "dropped kerb", "pram ramp"], "name": "Lowered Curb"},
     "barrier/kissing_gate": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "kissing_gate"}, "name": "Kissing Gate"},
     "barrier/lift_gate": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "lift_gate"}, "name": "Lift Gate"},
     "barrier/retaining_wall": {"fields": ["height"], "geometry": ["line", "area"], "tags": {"barrier": "retaining_wall"}, "name": "Retaining Wall"},
@@ -411,7 +411,7 @@
     "highway/service/emergency_access": {"icon": "iD-highway-service", "fields": ["name", "oneway", "maxspeed", "structure", "access", "surface", "maxheight"], "geometry": ["line"], "tags": {"highway": "service", "service": "emergency_access"}, "reference": {"key": "service", "value": "emergency_access"}, "name": "Emergency Access"},
     "highway/service/parking_aisle": {"icon": "iD-highway-service", "fields": ["name", "oneway", "maxspeed", "structure", "access", "surface", "maxheight"], "geometry": ["line"], "tags": {"highway": "service", "service": "parking_aisle"}, "reference": {"key": "service", "value": "parking_aisle"}, "name": "Parking Aisle"},
     "highway/services": {"icon": "maki-car", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"highway": "services"}, "terms": ["services", "travel plaza", "service station"], "name": "Service Area"},
-    "highway/speed_camera": {"icon": "maki-attraction", "geometry": ["point", "vertex"], "fields": ["direction", "ref"], "tags": {"highway": "speed_camera"}, "terms": [], "name": "Speed Camera"},
+    "highway/speed_camera": {"icon": "maki-attraction", "geometry": ["point", "vertex"], "fields": ["direction", "ref", "maxspeed"], "tags": {"highway": "speed_camera"}, "terms": [], "name": "Speed Camera"},
     "highway/steps": {"icon": "iD-highway-steps", "fields": ["surface", "lit", "width", "incline_steps", "handrail", "step_count"], "geometry": ["line"], "tags": {"highway": "steps"}, "terms": ["stairs", "staircase"], "name": "Steps"},
     "highway/steps/conveying": {"icon": "maki-entrance", "fields": ["name", "incline_steps", "conveying", "access_simple", "lit", "width", "handrail", "step_count"], "geometry": ["line"], "terms": ["moving staircase", "moving stairway", "people mover"], "tags": {"highway": "steps", "conveying": "*"}, "name": "Escalator"},
     "highway/stop": {"icon": "temaki-stop", "fields": ["stop", "direction_vertex"], "geometry": ["vertex"], "tags": {"highway": "stop"}, "terms": ["stop", "halt", "sign"], "name": "Stop Sign"},
@@ -572,7 +572,7 @@
     "man_made/observatory": {"geometry": ["point", "area"], "terms": ["astronomical", "meteorological"], "tags": {"man_made": "observatory"}, "name": "Observatory"},
     "man_made/petroleum_well": {"icon": "temaki-storage_tank", "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": {"icon": "iD-highway-footway", "fields": ["name", "surface", "lit", "width", "access"], "geometry": ["line", "area"], "terms": ["dock", "jetty"], "tags": {"man_made": "pier"}, "name": "Pier"},
-    "man_made/pipeline": {"icon": "iD-pipeline-line", "fields": ["location", "operator", "substance", "layer"], "geometry": ["line"], "tags": {"man_made": "pipeline"}, "name": "Pipeline"},
+    "man_made/pipeline": {"icon": "iD-pipeline-line", "fields": ["location", "operator", "substance", "layer"], "geometry": ["line"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline"}, "name": "Pipeline"},
     "man_made/pumping_station": {"icon": "maki-water", "geometry": ["point", "area"], "tags": {"man_made": "pumping_station"}, "name": "Pumping Station"},
     "man_made/silo": {"icon": "temaki-silo", "fields": ["crop", "building_area"], "geometry": ["point", "area"], "terms": ["grain", "corn", "wheat"], "tags": {"man_made": "silo"}, "name": "Silo"},
     "man_made/storage_tank": {"icon": "temaki-storage_tank", "fields": ["content", "building_area"], "geometry": ["point", "area"], "terms": ["water", "oil", "gas", "petrol"], "tags": {"man_made": "storage_tank"}, "name": "Storage Tank"},
@@ -660,15 +660,16 @@
     "office/telecommunication": {"icon": "maki-telephone", "fields": ["name", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"office": "telecommunication"}, "terms": ["communication", "internet", "phone", "voice"], "name": "Telecom Office"},
     "office/therapist": {"icon": "maki-suitcase", "fields": ["name", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"office": "therapist"}, "terms": ["therapy"], "name": "Therapist Office"},
     "office/water_utility": {"icon": "maki-suitcase", "fields": ["name", "address", "building_area", "opening_hours", "operator"], "geometry": ["point", "area"], "tags": {"office": "water_utility"}, "terms": ["water board", "utility"], "name": "Water Utility Office"},
-    "piste/downhill": {"icon": "maki-skiing", "fields": ["name", "piste/type_downhill", "piste/difficulty_downhill", "piste/grooming_downhill", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "alpine", "snowboard", "downhill", "piste"], "tags": {"piste:type": "downhill"}, "name": "Downhill Piste/Ski Run"},
-    "piste/hike": {"icon": "fas-snowflake", "fields": ["name", "piste/difficulty", "piste/grooming_hike", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["hike", "winter hiking", "snowshoe", "snowshoeing", "piste", "ski"], "tags": {"piste:type": "hike"}, "name": "Snowshoeing or Winter Hiking Trail"},
-    "piste/ice_skate": {"icon": "fas-snowflake", "fields": ["name", "sport_ice", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ice", "skating", "ski", "piste"], "tags": {"piste:type": "ice_skate"}, "name": "Ice Skating Piste"},
-    "piste/nordic": {"icon": "maki-skiing", "fields": ["name", "piste/type_nordic", "piste/difficulty_nordic", "piste/grooming_nordic", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "nordic", "crosscountry", "skating", "piste"], "tags": {"piste:type": "nordic"}, "name": "Nordic or Crosscountry Piste/Ski Trail"},
+    "piste/downhill": {"icon": "maki-skiing", "fields": ["name", "piste/type", "piste/difficulty_downhill", "piste/grooming_downhill", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "alpine", "snowboard", "downhill", "piste"], "tags": {"piste:type": "downhill"}, "name": "Downhill Piste/Ski Run"},
+    "piste/hike": {"icon": "fas-snowflake", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming_hike", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["hike", "winter hiking", "snowshoe", "snowshoeing", "piste", "ski"], "tags": {"piste:type": "hike"}, "name": "Snowshoeing or Winter Hiking Trail"},
+    "piste/ice_skate": {"icon": "fas-snowflake", "fields": ["name", "piste/type", "sport_ice", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ice", "skating", "ski", "piste"], "tags": {"piste:type": "ice_skate"}, "name": "Ice Skating Piste"},
+    "piste/nordic": {"icon": "maki-skiing", "fields": ["name", "piste/type", "piste/difficulty_nordic", "piste/grooming_nordic", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "nordic", "crosscountry", "skating", "piste"], "tags": {"piste:type": "nordic"}, "name": "Nordic or Crosscountry Piste/Ski Trail"},
     "piste/piste": {"icon": "maki-skiing", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "nordic", "crosscountry", "downhill", "alpine", "snowboard", "skitour", "ski touring", "sled", "luge", "sleigh", "sledge", "ski-joring", "husky", "horse", "winter hiking", "snowshoe", "snowshoeing", "ice", "skating"], "tags": {"piste:type": "*"}, "name": "Winter Sport Trails"},
-    "piste/skitour": {"icon": "maki-skiing", "fields": ["name", "piste/difficulty_skitour", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "skitour", "crosscountry", "ski touring", "piste"], "tags": {"piste:type": "skitour"}, "name": "Ski Touring Trail"},
-    "piste/sled": {"icon": "fas-snowflake", "fields": ["name", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "sled", "luge", "sleigh", "sledge", "piste"], "tags": {"piste:type": "sled"}, "name": "Sled Piste"},
-    "piste/sleigh": {"icon": "fas-snowflake", "fields": ["name", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "piste", "sled", "luge", "sleigh", "sledge", "ski-joring", "husky", "horse"], "tags": {"piste:type": "sleigh"}, "name": "Sleigh Piste"},
+    "piste/skitour": {"icon": "maki-skiing", "fields": ["name", "piste/type", "piste/difficulty_skitour", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "skitour", "crosscountry", "ski touring", "piste"], "tags": {"piste:type": "skitour"}, "name": "Ski Touring Trail"},
+    "piste/sled": {"icon": "fas-snowflake", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "sled", "luge", "sleigh", "sledge", "piste"], "tags": {"piste:type": "sled"}, "name": "Sled Piste"},
+    "piste/sleigh": {"icon": "fas-snowflake", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "piste", "sled", "luge", "sleigh", "sledge", "ski-joring", "husky", "horse"], "tags": {"piste:type": "sleigh"}, "name": "Sleigh Piste"},
     "place/farm": {"icon": "maki-farm", "geometry": ["point", "area"], "fields": ["name"], "tags": {"place": "farm"}, "name": "Farm", "searchable": false},
+    "place/city_block": {"icon": "maki-triangle-stroked", "fields": ["name"], "geometry": ["point", "area"], "tags": {"place": "city_block"}, "name": "City Block"},
     "place/city": {"icon": "maki-city", "fields": ["name", "population"], "geometry": ["point", "area"], "tags": {"place": "city"}, "name": "City"},
     "place/hamlet": {"icon": "maki-triangle-stroked", "fields": ["name", "population"], "geometry": ["point", "area"], "tags": {"place": "hamlet"}, "name": "Hamlet"},
     "place/island": {"icon": "maki-mountain", "geometry": ["point", "area"], "fields": ["name"], "terms": ["archipelago", "atoll", "bar", "cay", "isle", "islet", "key", "reef"], "tags": {"place": "island"}, "name": "Island"},
@@ -698,16 +699,18 @@
     "playground/zipwire": {"icon": "maki-playground", "geometry": ["point", "line"], "tags": {"playground": "zipwire"}, "name": "Zip Wire"},
     "point": {"fields": ["name"], "geometry": ["point"], "tags": {}, "name": "Point", "matchScore": 0.1},
     "power/sub_station": {"icon": "temaki-power", "fields": ["substation", "operator", "building", "ref"], "geometry": ["point", "area"], "tags": {"power": "sub_station"}, "reference": {"key": "power", "value": "substation"}, "name": "Substation", "searchable": false},
+    "power/cable/underground": {"fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "cable", "location": "underground"}, "name": "Underground Power Cable"},
     "power/generator": {"icon": "temaki-power", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "geometry": ["point", "vertex", "area"], "terms": ["hydro", "solar", "turbine", "wind"], "tags": {"power": "generator"}, "name": "Power Generator"},
-    "power/generator/source_nuclear": {"icon": "temaki-radiation", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "geometry": ["point", "vertex", "area"], "terms": ["fission", "generator", "nuclear", "nuke", "reactor"], "tags": {"power": "generator", "generator:source": "nuclear", "generator:method": "fission"}, "reference": {"key": "generator:source", "value": "nuclear"}, "name": "Nuclear Reactor"},
-    "power/generator/source_wind": {"icon": "temaki-wind_turbine", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "height", "ref"], "geometry": ["point", "vertex", "area"], "terms": ["generator", "turbine", "windmill", "wind"], "tags": {"power": "generator", "generator:source": "wind", "generator:method": "wind_turbine"}, "reference": {"key": "generator:source", "value": "wind"}, "name": "Wind Turbine"},
+    "power/generator/method/photovoltaic": {"icon": "fas-solar-panel", "fields": ["operator", "generator/output/electricity", "ref"], "geometry": ["point", "vertex", "area"], "terms": ["photovoltaic module", "PV module", "sunlight"], "tags": {"power": "generator", "generator:source": "solar", "generator:method": "photovoltaic", "generator:type": "solar_photovoltaic_panel"}, "addTags": {"power": "generator", "generator:source": "solar", "generator:method": "photovoltaic", "generator:type": "solar_photovoltaic_panel", "generator:output:electricity": "yes"}, "removeTags": {"power": "generator", "generator:source": "solar", "generator:method": "photovoltaic", "generator:type": "solar_photovoltaic_panel", "generator:output:electricity": "yes"}, "reference": {"key": "generator:method", "value": "photovoltaic"}, "name": "Solar Panel"},
+    "power/generator/source/nuclear": {"icon": "temaki-radiation", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "geometry": ["point", "vertex", "area"], "terms": ["fission", "generator", "nuclear", "nuke", "reactor"], "tags": {"power": "generator", "generator:source": "nuclear", "generator:method": "fission"}, "reference": {"key": "generator:source", "value": "nuclear"}, "name": "Nuclear Reactor"},
+    "power/generator/source/wind": {"icon": "temaki-wind_turbine", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "height", "ref"], "geometry": ["point", "vertex", "area"], "terms": ["generator", "turbine", "windmill", "wind"], "tags": {"power": "generator", "generator:source": "wind", "generator:method": "wind_turbine"}, "reference": {"key": "generator:source", "value": "wind"}, "name": "Wind Turbine"},
     "power/line": {"icon": "iD-power-line", "fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "line"}, "name": "Power Line"},
     "power/minor_line": {"icon": "iD-power-line", "fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "minor_line"}, "name": "Minor Power Line"},
     "power/plant": {"icon": "maki-industry", "fields": ["name", "operator", "address", "plant/output/electricity", "start_date"], "geometry": ["area"], "tags": {"power": "plant"}, "addTags": {"power": "plant", "landuse": "industrial"}, "removeTags": {"power": "plant", "landuse": "industrial"}, "terms": ["coal", "gas", "generat*", "hydro", "nuclear", "power", "station"], "name": "Power Station Grounds"},
     "power/pole": {"fields": ["ref"], "geometry": ["point", "vertex"], "tags": {"power": "pole"}, "name": "Power Pole"},
     "power/substation": {"icon": "temaki-power", "fields": ["substation", "operator", "building", "ref"], "geometry": ["point", "area"], "tags": {"power": "substation"}, "name": "Substation"},
     "power/switch": {"icon": "temaki-power", "fields": ["switch", "operator", "location", "cables", "voltage", "ref"], "geometry": ["point", "vertex", "area"], "tags": {"power": "switch"}, "name": "Power Switch"},
-    "power/tower": {"fields": ["design", "ref"], "geometry": ["vertex"], "terms": ["power"], "tags": {"power": "tower"}, "name": "High-Voltage Tower"},
+    "power/tower": {"fields": ["design", "ref"], "geometry": ["point", "vertex"], "terms": ["power"], "tags": {"power": "tower"}, "name": "High-Voltage Tower"},
     "power/transformer": {"icon": "temaki-power", "fields": ["transformer", "operator", "location", "rating", "devices", "phases", "frequency", "voltage/primary", "voltage/secondary", "voltage/tertiary", "windings", "windings/configuration", "ref"], "geometry": ["point", "vertex", "area"], "tags": {"power": "transformer"}, "name": "Transformer"},
     "public_transport/linear_platform_aerialway": {"icon": "iD-highway-footway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["line"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["aerialway", "cable car", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Aerialway Stop / Platform"},
     "public_transport/linear_platform_bus": {"icon": "iD-highway-footway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter", "passenger_information_display"], "geometry": ["line"], "tags": {"public_transport": "platform", "bus": "yes"}, "addTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "removeTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stop / Platform"},
@@ -775,7 +778,7 @@
     "railway/train_wash": {"icon": "maki-rail", "geometry": ["point", "vertex", "area"], "fields": ["operator", "building_area"], "tags": {"railway": "wash"}, "terms": ["wash", "clean"], "name": "Train Wash"},
     "railway/tram": {"icon": "iD-railway-light-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail", "voltage", "frequency"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["light rail", "streetcar", "tram", "trolley"], "name": "Tram"},
     "relation": {"icon": "iD-relation", "fields": ["name", "relation"], "geometry": ["relation"], "tags": {}, "name": "Relation"},
-    "route/ferry": {"icon": "iD-ferry-line", "geometry": ["line"], "fields": ["name", "operator", "duration", "access"], "tags": {"route": "ferry"}, "name": "Ferry Route"},
+    "route/ferry": {"icon": "iD-ferry-line", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "to", "from"], "tags": {"route": "ferry"}, "name": "Ferry Route"},
     "seamark/beacon_isolated_danger": {"fields": ["ref", "operator", "seamark/beacon_isolated_danger/shape"], "geometry": ["point", "vertex"], "terms": ["beacon isolated danger", "isolated danger beacon", "iala"], "tags": {"seamark:type": "beacon_isolated_danger"}, "name": "Danger Beacon"},
     "seamark/beacon_lateral": {"fields": ["ref", "operator", "seamark/beacon_lateral/colour", "seamark/beacon_lateral/category", "seamark/beacon_lateral/shape", "seamark/beacon_lateral/system"], "geometry": ["point", "vertex"], "terms": ["lateral beacon", "beacon lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "beacon_lateral"}, "name": "Channel Beacon"},
     "seamark/buoy_lateral": {"fields": ["ref", "operator", "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", "seamark/buoy_lateral/system"], "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral"}, "name": "Channel Buoy"},
@@ -970,21 +973,21 @@
     "type/restriction/only_u_turn": {"icon": "iD-restriction-only-u-turn", "fields": ["except"], "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "only_u_turn"}, "name": "Only U-turn"},
     "type/route_master": {"icon": "iD-route-master", "fields": ["name", "route_master", "ref", "operator", "network"], "geometry": ["relation"], "tags": {"type": "route_master"}, "name": "Route Master"},
     "type/route": {"icon": "iD-route", "fields": ["name", "route", "ref_route", "operator", "network"], "geometry": ["relation"], "tags": {"type": "route"}, "name": "Route"},
-    "type/route/bicycle": {"icon": "iD-route-bicycle", "fields": ["name", "ref_route", "network_bicycle", "cycle_network"], "geometry": ["relation"], "tags": {"type": "route", "route": "bicycle"}, "name": "Cycle Route"},
-    "type/route/bus": {"icon": "iD-route-bus", "fields": ["name", "ref_route", "operator", "network"], "geometry": ["relation"], "tags": {"type": "route", "route": "bus"}, "name": "Bus Route"},
-    "type/route/detour": {"icon": "iD-route-detour", "fields": ["name", "ref_route"], "geometry": ["relation"], "tags": {"type": "route", "route": "detour"}, "name": "Detour Route"},
-    "type/route/ferry": {"icon": "iD-route-ferry", "fields": ["name", "ref_route", "operator", "network"], "geometry": ["relation"], "tags": {"type": "route", "route": "ferry"}, "name": "Ferry Route"},
-    "type/route/foot": {"icon": "iD-route-foot", "fields": ["name", "ref_route", "operator", "network_foot"], "geometry": ["relation"], "tags": {"type": "route", "route": "foot"}, "name": "Foot Route"},
-    "type/route/hiking": {"icon": "iD-route-foot", "fields": ["name", "ref_route", "operator", "network_foot", "description", "distance"], "geometry": ["relation"], "tags": {"type": "route", "route": "hiking"}, "name": "Hiking Route"},
-    "type/route/horse": {"icon": "iD-route-horse", "fields": ["name", "ref_route", "operator", "network_horse", "description", "distance"], "geometry": ["relation"], "tags": {"type": "route", "route": "horse"}, "name": "Riding Route"},
-    "type/route/light_rail": {"icon": "iD-route-light-rail", "fields": ["name", "ref_route", "operator", "network"], "geometry": ["relation"], "tags": {"type": "route", "route": "light_rail"}, "name": "Light Rail Route"},
-    "type/route/pipeline": {"icon": "iD-route-pipeline", "fields": ["name", "ref_route", "operator"], "geometry": ["relation"], "tags": {"type": "route", "route": "pipeline"}, "name": "Pipeline Route"},
-    "type/route/piste": {"icon": "iD-route-piste", "fields": ["name", "piste/type", "colour", "ref_route", "operator"], "geometry": ["relation"], "tags": {"type": "route", "route": "piste"}, "name": "Piste/Ski Route"},
-    "type/route/power": {"icon": "iD-route-power", "fields": ["name", "ref_route", "operator"], "geometry": ["relation"], "tags": {"type": "route", "route": "power"}, "name": "Power Route"},
-    "type/route/road": {"icon": "iD-route-road", "fields": ["name", "ref_route", "network_road"], "geometry": ["relation"], "tags": {"type": "route", "route": "road"}, "name": "Road Route"},
-    "type/route/subway": {"icon": "iD-route-subway", "fields": ["name", "ref_route", "operator", "network"], "geometry": ["relation"], "tags": {"type": "route", "route": "subway"}, "name": "Subway Route"},
-    "type/route/train": {"icon": "iD-route-train", "fields": ["name", "ref_route", "operator", "network"], "geometry": ["relation"], "tags": {"type": "route", "route": "train"}, "name": "Train Route"},
-    "type/route/tram": {"icon": "iD-route-tram", "fields": ["name", "ref_route", "operator", "network"], "geometry": ["relation"], "tags": {"type": "route", "route": "tram"}, "name": "Tram Route"},
+    "type/route/bicycle": {"icon": "iD-route-bicycle", "fields": ["name", "ref_route", "network_bicycle", "cycle_network", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "bicycle"}, "name": "Cycle Route"},
+    "type/route/bus": {"icon": "iD-route-bus", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "bus"}, "name": "Bus Route"},
+    "type/route/detour": {"icon": "iD-route-detour", "fields": ["name", "ref_route", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "detour"}, "name": "Detour Route"},
+    "type/route/ferry": {"icon": "iD-route-ferry", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "ferry"}, "name": "Ferry Route"},
+    "type/route/foot": {"icon": "iD-route-foot", "fields": ["name", "ref_route", "operator", "network_foot", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "foot"}, "name": "Foot Route"},
+    "type/route/hiking": {"icon": "iD-route-foot", "fields": ["name", "ref_route", "operator", "network_foot", "description", "distance", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "hiking"}, "name": "Hiking Route"},
+    "type/route/horse": {"icon": "iD-route-horse", "fields": ["name", "ref_route", "operator", "network_horse", "description", "distance", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "horse"}, "name": "Riding Route"},
+    "type/route/light_rail": {"icon": "iD-route-light-rail", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "light_rail"}, "name": "Light Rail Route"},
+    "type/route/pipeline": {"icon": "iD-route-pipeline", "fields": ["name", "ref_route", "operator", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "pipeline"}, "name": "Pipeline Route"},
+    "type/route/piste": {"icon": "iD-route-piste", "fields": ["name", "piste/type", "colour", "ref_route", "operator", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "piste"}, "name": "Piste/Ski Route"},
+    "type/route/power": {"icon": "iD-route-power", "fields": ["name", "ref_route", "operator", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "power"}, "name": "Power Route"},
+    "type/route/road": {"icon": "iD-route-road", "fields": ["name", "ref_route", "network_road", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "road"}, "name": "Road Route"},
+    "type/route/subway": {"icon": "iD-route-subway", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "subway"}, "name": "Subway Route"},
+    "type/route/train": {"icon": "iD-route-train", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "train"}, "name": "Train Route"},
+    "type/route/tram": {"icon": "iD-route-tram", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "tram"}, "name": "Tram Route"},
     "type/site": {"icon": "iD-relation", "fields": ["name", "site"], "geometry": ["relation"], "tags": {"type": "site"}, "name": "Site"},
     "type/waterway": {"icon": "iD-route-water", "fields": ["name", "waterway", "ref"], "geometry": ["relation"], "tags": {"type": "waterway"}, "name": "Waterway"},
     "vertex": {"fields": ["name"], "geometry": ["vertex"], "tags": {}, "name": "Other", "matchScore": 0.1},
@@ -1512,80 +1515,80 @@
     "amenity/bureau_de_change/Abitab": {"tags": {"name": "Abitab", "amenity": "bureau_de_change"}, "name": "Abitab", "icon": "maki-bank", "geometry": ["point", "area"], "fields": ["name", "currency_multi", "operator", "address", "building_area", "opening_hours"], "suggestion": true},
     "amenity/bureau_de_change/Change": {"tags": {"name": "Change", "amenity": "bureau_de_change"}, "name": "Change", "icon": "maki-bank", "geometry": ["point", "area"], "fields": ["name", "currency_multi", "operator", "address", "building_area", "opening_hours"], "suggestion": true},
     "amenity/bureau_de_change/Travelex": {"tags": {"name": "Travelex", "amenity": "bureau_de_change"}, "name": "Travelex", "icon": "maki-bank", "geometry": ["point", "area"], "fields": ["name", "currency_multi", "operator", "address", "building_area", "opening_hours"], "suggestion": true},
-    "amenity/cafe/85度C": {"tags": {"name": "85度C", "amenity": "cafe"}, "name": "85度C", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Bar Kafe": {"tags": {"name": "Bar Kafe", "amenity": "cafe"}, "name": "Bar Kafe", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Barista": {"tags": {"name": "Barista", "amenity": "cafe"}, "name": "Barista", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Bonafide": {"tags": {"name": "Bonafide", "amenity": "cafe"}, "name": "Bonafide", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Cafe Coffee Day": {"tags": {"name": "Cafe Coffee Day", "amenity": "cafe"}, "name": "Cafe Coffee Day", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Cafe Nero": {"tags": {"name": "Cafe Nero", "amenity": "cafe"}, "name": "Cafe Nero", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Cafeteria": {"tags": {"name": "Cafeteria", "amenity": "cafe"}, "name": "Cafeteria", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Cafetería": {"tags": {"name": "Cafetería", "amenity": "cafe"}, "name": "Cafetería", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Caffè Nero": {"tags": {"name": "Caffè Nero", "amenity": "cafe"}, "name": "Caffè Nero", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Café Amazon": {"tags": {"name": "Café Amazon", "amenity": "cafe"}, "name": "Café Amazon", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Café Central": {"tags": {"name": "Café Central", "amenity": "cafe"}, "name": "Café Central", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Café de la Place": {"tags": {"name": "Café de la Place", "amenity": "cafe"}, "name": "Café de la Place", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Café des Sports": {"tags": {"name": "Café des Sports", "amenity": "cafe"}, "name": "Café des Sports", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Caribou Coffee": {"tags": {"name": "Caribou Coffee", "amenity": "cafe"}, "name": "Caribou Coffee", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Coffee Fellows": {"tags": {"name": "Coffee Fellows", "amenity": "cafe"}, "name": "Coffee Fellows", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Coffee House": {"tags": {"name": "Coffee House", "amenity": "cafe"}, "name": "Coffee House", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Coffee Island": {"tags": {"name": "Coffee Island", "amenity": "cafe"}, "name": "Coffee Island", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Coffee Time": {"tags": {"name": "Coffee Time", "amenity": "cafe"}, "name": "Coffee Time", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Costa": {"tags": {"name": "Costa", "amenity": "cafe"}, "name": "Costa", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Country Style": {"tags": {"name": "Country Style", "amenity": "cafe"}, "name": "Country Style", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Dunkin' Donuts": {"tags": {"name": "Dunkin' Donuts", "cuisine": "donut", "amenity": "cafe"}, "name": "Dunkin' Donuts", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Eiscafe Dolomiti": {"tags": {"name": "Eiscafe Dolomiti", "amenity": "cafe"}, "name": "Eiscafe Dolomiti", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Eiscafe Venezia": {"tags": {"name": "Eiscafe Venezia", "amenity": "cafe"}, "name": "Eiscafe Venezia", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Espresso House": {"tags": {"name": "Espresso House", "amenity": "cafe"}, "name": "Espresso House", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Havanna": {"tags": {"name": "Havanna", "amenity": "cafe"}, "name": "Havanna", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Internet Cafe": {"tags": {"name": "Internet Cafe", "amenity": "cafe"}, "name": "Internet Cafe", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Kafe": {"tags": {"name": "Kafe", "amenity": "cafe"}, "name": "Kafe", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Krispy Kreme": {"tags": {"name": "Krispy Kreme", "amenity": "cafe"}, "name": "Krispy Kreme", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Le Pain Quotidien": {"tags": {"name": "Le Pain Quotidien", "amenity": "cafe"}, "name": "Le Pain Quotidien", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/McCafé": {"tags": {"name": "McCafé", "amenity": "cafe", "cuisine": "coffee_shop"}, "name": "McCafé", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Peet's Coffee & Tea": {"tags": {"name": "Peet's Coffee & Tea", "amenity": "cafe"}, "name": "Peet's Coffee & Tea", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Pret A Manger": {"tags": {"name": "Pret A Manger", "amenity": "cafe"}, "name": "Pret A Manger", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Prime": {"tags": {"name": "Prime", "amenity": "cafe"}, "name": "Prime", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Second Cup": {"tags": {"name": "Second Cup", "amenity": "cafe"}, "name": "Second Cup", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Segafredo": {"tags": {"name": "Segafredo", "amenity": "cafe"}, "name": "Segafredo", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Starbucks": {"tags": {"name": "Starbucks", "cuisine": "coffee_shop", "amenity": "cafe"}, "name": "Starbucks", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/The Coffee Bean & Tea Leaf": {"tags": {"name": "The Coffee Bean & Tea Leaf", "amenity": "cafe"}, "name": "The Coffee Bean & Tea Leaf", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/The Coffee Club": {"tags": {"name": "The Coffee Club", "amenity": "cafe"}, "name": "The Coffee Club", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Tim Hortons": {"tags": {"name": "Tim Hortons", "amenity": "cafe"}, "name": "Tim Hortons", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Traveler's Coffee": {"tags": {"name": "Traveler's Coffee", "amenity": "cafe"}, "name": "Traveler's Coffee", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Wayne's Coffee": {"tags": {"name": "Wayne's Coffee", "amenity": "cafe"}, "name": "Wayne's Coffee", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Бистро": {"tags": {"name": "Бистро", "amenity": "cafe"}, "name": "Бистро", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Буфет": {"tags": {"name": "Буфет", "amenity": "cafe"}, "name": "Буфет", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Встреча": {"tags": {"name": "Встреча", "amenity": "cafe"}, "name": "Встреча", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Даблби": {"tags": {"name": "Даблби", "amenity": "cafe"}, "name": "Даблби", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Закусочная": {"tags": {"name": "Закусочная", "amenity": "cafe"}, "name": "Закусочная", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Кофе Хауз": {"tags": {"name": "Кофе Хауз", "amenity": "cafe"}, "name": "Кофе Хауз", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Кофейня": {"tags": {"name": "Кофейня", "amenity": "cafe"}, "name": "Кофейня", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Лакомка": {"tags": {"name": "Лакомка", "amenity": "cafe"}, "name": "Лакомка", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Летнее кафе": {"tags": {"name": "Летнее кафе", "amenity": "cafe"}, "name": "Летнее кафе", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Пельменная": {"tags": {"name": "Пельменная", "amenity": "cafe"}, "name": "Пельменная", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Пиццерия": {"tags": {"name": "Пиццерия", "amenity": "cafe"}, "name": "Пиццерия", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Рандеву": {"tags": {"name": "Рандеву", "amenity": "cafe"}, "name": "Рандеву", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Сказка": {"tags": {"name": "Сказка", "amenity": "cafe"}, "name": "Сказка", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Старбакс": {"tags": {"name": "Старбакс", "amenity": "cafe"}, "name": "Старбакс", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Столовая": {"tags": {"name": "Столовая", "amenity": "cafe"}, "name": "Столовая", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Уют": {"tags": {"name": "Уют", "amenity": "cafe"}, "name": "Уют", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Хуторок": {"tags": {"name": "Хуторок", "amenity": "cafe"}, "name": "Хуторок", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Шашлычная": {"tags": {"name": "Шашлычная", "amenity": "cafe"}, "name": "Шашлычная", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Шоколад": {"tags": {"name": "Шоколад", "amenity": "cafe"}, "name": "Шоколад", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/Шоколадница": {"tags": {"name": "Шоколадница", "amenity": "cafe"}, "name": "Шоколадница", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/ארומה": {"tags": {"name": "ארומה", "amenity": "cafe"}, "name": "ארומה", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/مقهى": {"tags": {"name": "مقهى", "amenity": "cafe"}, "name": "مقهى", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/คาเฟ่ อเมซอน": {"tags": {"name": "คาเฟ่ อเมซอน", "amenity": "cafe"}, "name": "คาเฟ่ อเมซอน", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/エクセルシオール カフェ": {"tags": {"name": "エクセルシオール カフェ", "amenity": "cafe"}, "name": "エクセルシオール カフェ", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/カフェ・ド・クリエ": {"tags": {"name": "カフェ・ド・クリエ", "name:en": "Cafe de CRIE", "amenity": "cafe"}, "name": "カフェ・ド・クリエ", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/カフェ・ベローチェ": {"tags": {"name": "カフェ・ベローチェ", "amenity": "cafe"}, "name": "カフェ・ベローチェ", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/コメダ珈琲店": {"tags": {"name": "コメダ珈琲店", "amenity": "cafe"}, "name": "コメダ珈琲店", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/サンマルクカフェ": {"tags": {"name": "サンマルクカフェ", "amenity": "cafe"}, "name": "サンマルクカフェ", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/スターバックス": {"tags": {"name": "スターバックス", "name:en": "Starbucks", "amenity": "cafe"}, "name": "スターバックス", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/タリーズコーヒー": {"tags": {"name": "タリーズコーヒー", "amenity": "cafe"}, "name": "タリーズコーヒー", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/ドトールコーヒーショップ": {"tags": {"name": "ドトールコーヒーショップ", "name:en": "Doutor", "amenity": "cafe"}, "name": "ドトールコーヒーショップ", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/星巴克": {"tags": {"name": "星巴克", "amenity": "cafe"}, "name": "星巴克", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
-    "amenity/cafe/스타벅스": {"tags": {"name": "스타벅스", "amenity": "cafe"}, "name": "스타벅스", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "suggestion": true},
+    "amenity/cafe/85度C": {"tags": {"name": "85度C", "amenity": "cafe"}, "name": "85度C", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Bar Kafe": {"tags": {"name": "Bar Kafe", "amenity": "cafe"}, "name": "Bar Kafe", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Barista": {"tags": {"name": "Barista", "amenity": "cafe"}, "name": "Barista", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Bonafide": {"tags": {"name": "Bonafide", "amenity": "cafe"}, "name": "Bonafide", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Cafe Coffee Day": {"tags": {"name": "Cafe Coffee Day", "amenity": "cafe"}, "name": "Cafe Coffee Day", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Cafe Nero": {"tags": {"name": "Cafe Nero", "amenity": "cafe"}, "name": "Cafe Nero", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Cafeteria": {"tags": {"name": "Cafeteria", "amenity": "cafe"}, "name": "Cafeteria", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Cafetería": {"tags": {"name": "Cafetería", "amenity": "cafe"}, "name": "Cafetería", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Caffè Nero": {"tags": {"name": "Caffè Nero", "amenity": "cafe"}, "name": "Caffè Nero", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Café Amazon": {"tags": {"name": "Café Amazon", "amenity": "cafe"}, "name": "Café Amazon", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Café Central": {"tags": {"name": "Café Central", "amenity": "cafe"}, "name": "Café Central", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Café de la Place": {"tags": {"name": "Café de la Place", "amenity": "cafe"}, "name": "Café de la Place", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Café des Sports": {"tags": {"name": "Café des Sports", "amenity": "cafe"}, "name": "Café des Sports", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Caribou Coffee": {"tags": {"name": "Caribou Coffee", "amenity": "cafe"}, "name": "Caribou Coffee", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Coffee Fellows": {"tags": {"name": "Coffee Fellows", "amenity": "cafe"}, "name": "Coffee Fellows", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Coffee House": {"tags": {"name": "Coffee House", "amenity": "cafe"}, "name": "Coffee House", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Coffee Island": {"tags": {"name": "Coffee Island", "amenity": "cafe"}, "name": "Coffee Island", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Coffee Time": {"tags": {"name": "Coffee Time", "amenity": "cafe"}, "name": "Coffee Time", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Costa": {"tags": {"name": "Costa", "amenity": "cafe"}, "name": "Costa", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Country Style": {"tags": {"name": "Country Style", "amenity": "cafe"}, "name": "Country Style", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Dunkin' Donuts": {"tags": {"name": "Dunkin' Donuts", "cuisine": "donut", "amenity": "cafe"}, "name": "Dunkin' Donuts", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Eiscafe Dolomiti": {"tags": {"name": "Eiscafe Dolomiti", "amenity": "cafe"}, "name": "Eiscafe Dolomiti", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Eiscafe Venezia": {"tags": {"name": "Eiscafe Venezia", "amenity": "cafe"}, "name": "Eiscafe Venezia", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Espresso House": {"tags": {"name": "Espresso House", "amenity": "cafe"}, "name": "Espresso House", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Havanna": {"tags": {"name": "Havanna", "amenity": "cafe"}, "name": "Havanna", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Internet Cafe": {"tags": {"name": "Internet Cafe", "amenity": "cafe"}, "name": "Internet Cafe", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Kafe": {"tags": {"name": "Kafe", "amenity": "cafe"}, "name": "Kafe", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Krispy Kreme": {"tags": {"name": "Krispy Kreme", "amenity": "cafe"}, "name": "Krispy Kreme", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Le Pain Quotidien": {"tags": {"name": "Le Pain Quotidien", "amenity": "cafe"}, "name": "Le Pain Quotidien", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/McCafé": {"tags": {"name": "McCafé", "amenity": "cafe", "cuisine": "coffee_shop"}, "name": "McCafé", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Peet's Coffee & Tea": {"tags": {"name": "Peet's Coffee & Tea", "amenity": "cafe"}, "name": "Peet's Coffee & Tea", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Pret A Manger": {"tags": {"name": "Pret A Manger", "amenity": "cafe"}, "name": "Pret A Manger", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Prime": {"tags": {"name": "Prime", "amenity": "cafe"}, "name": "Prime", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Second Cup": {"tags": {"name": "Second Cup", "amenity": "cafe"}, "name": "Second Cup", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Segafredo": {"tags": {"name": "Segafredo", "amenity": "cafe"}, "name": "Segafredo", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Starbucks": {"tags": {"name": "Starbucks", "cuisine": "coffee_shop", "amenity": "cafe"}, "name": "Starbucks", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/The Coffee Bean & Tea Leaf": {"tags": {"name": "The Coffee Bean & Tea Leaf", "amenity": "cafe"}, "name": "The Coffee Bean & Tea Leaf", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/The Coffee Club": {"tags": {"name": "The Coffee Club", "amenity": "cafe"}, "name": "The Coffee Club", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Tim Hortons": {"tags": {"name": "Tim Hortons", "amenity": "cafe"}, "name": "Tim Hortons", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Traveler's Coffee": {"tags": {"name": "Traveler's Coffee", "amenity": "cafe"}, "name": "Traveler's Coffee", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Wayne's Coffee": {"tags": {"name": "Wayne's Coffee", "amenity": "cafe"}, "name": "Wayne's Coffee", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Бистро": {"tags": {"name": "Бистро", "amenity": "cafe"}, "name": "Бистро", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Буфет": {"tags": {"name": "Буфет", "amenity": "cafe"}, "name": "Буфет", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Встреча": {"tags": {"name": "Встреча", "amenity": "cafe"}, "name": "Встреча", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Даблби": {"tags": {"name": "Даблби", "amenity": "cafe"}, "name": "Даблби", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Закусочная": {"tags": {"name": "Закусочная", "amenity": "cafe"}, "name": "Закусочная", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Кофе Хауз": {"tags": {"name": "Кофе Хауз", "amenity": "cafe"}, "name": "Кофе Хауз", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Кофейня": {"tags": {"name": "Кофейня", "amenity": "cafe"}, "name": "Кофейня", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Лакомка": {"tags": {"name": "Лакомка", "amenity": "cafe"}, "name": "Лакомка", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Летнее кафе": {"tags": {"name": "Летнее кафе", "amenity": "cafe"}, "name": "Летнее кафе", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Пельменная": {"tags": {"name": "Пельменная", "amenity": "cafe"}, "name": "Пельменная", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Пиццерия": {"tags": {"name": "Пиццерия", "amenity": "cafe"}, "name": "Пиццерия", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Рандеву": {"tags": {"name": "Рандеву", "amenity": "cafe"}, "name": "Рандеву", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Сказка": {"tags": {"name": "Сказка", "amenity": "cafe"}, "name": "Сказка", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Старбакс": {"tags": {"name": "Старбакс", "amenity": "cafe"}, "name": "Старбакс", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Столовая": {"tags": {"name": "Столовая", "amenity": "cafe"}, "name": "Столовая", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Уют": {"tags": {"name": "Уют", "amenity": "cafe"}, "name": "Уют", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Хуторок": {"tags": {"name": "Хуторок", "amenity": "cafe"}, "name": "Хуторок", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Шашлычная": {"tags": {"name": "Шашлычная", "amenity": "cafe"}, "name": "Шашлычная", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Шоколад": {"tags": {"name": "Шоколад", "amenity": "cafe"}, "name": "Шоколад", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/Шоколадница": {"tags": {"name": "Шоколадница", "amenity": "cafe"}, "name": "Шоколадница", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/ארומה": {"tags": {"name": "ארומה", "amenity": "cafe"}, "name": "ארומה", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/مقهى": {"tags": {"name": "مقهى", "amenity": "cafe"}, "name": "مقهى", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/คาเฟ่ อเมซอน": {"tags": {"name": "คาเฟ่ อเมซอน", "amenity": "cafe"}, "name": "คาเฟ่ อเมซอน", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/エクセルシオール カフェ": {"tags": {"name": "エクセルシオール カフェ", "amenity": "cafe"}, "name": "エクセルシオール カフェ", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/カフェ・ド・クリエ": {"tags": {"name": "カフェ・ド・クリエ", "name:en": "Cafe de CRIE", "amenity": "cafe"}, "name": "カフェ・ド・クリエ", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/カフェ・ベローチェ": {"tags": {"name": "カフェ・ベローチェ", "amenity": "cafe"}, "name": "カフェ・ベローチェ", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/コメダ珈琲店": {"tags": {"name": "コメダ珈琲店", "amenity": "cafe"}, "name": "コメダ珈琲店", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/サンマルクカフェ": {"tags": {"name": "サンマルクカフェ", "amenity": "cafe"}, "name": "サンマルクカフェ", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/スターバックス": {"tags": {"name": "スターバックス", "name:en": "Starbucks", "amenity": "cafe"}, "name": "スターバックス", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/タリーズコーヒー": {"tags": {"name": "タリーズコーヒー", "amenity": "cafe"}, "name": "タリーズコーヒー", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/ドトールコーヒーショップ": {"tags": {"name": "ドトールコーヒーショップ", "name:en": "Doutor", "amenity": "cafe"}, "name": "ドトールコーヒーショップ", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/星巴克": {"tags": {"name": "星巴克", "amenity": "cafe"}, "name": "星巴克", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
+    "amenity/cafe/스타벅스": {"tags": {"name": "스타벅스", "amenity": "cafe"}, "name": "스타벅스", "icon": "maki-cafe", "geometry": ["point", "area"], "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating", "takeaway"], "suggestion": true},
     "amenity/car_rental/Alamo": {"tags": {"name": "Alamo", "amenity": "car_rental"}, "name": "Alamo", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
     "amenity/car_rental/Avis": {"tags": {"name": "Avis", "amenity": "car_rental"}, "name": "Avis", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
     "amenity/car_rental/Budget": {"tags": {"name": "Budget", "amenity": "car_rental"}, "name": "Budget", "icon": "maki-car", "geometry": ["point", "area"], "fields": ["name", "operator", "payment_multi"], "suggestion": true},
diff --git a/data/presets/presets/amenity/bench.json b/data/presets/presets/amenity/bench.json
index fa9be5ffc..5d58127cd 100644
--- a/data/presets/presets/amenity/bench.json
+++ b/data/presets/presets/amenity/bench.json
@@ -1,7 +1,10 @@
 {
     "icon": "temaki-bench",
     "fields": [
-        "backrest"
+        "backrest",
+        "material",
+        "seats",
+        "colour"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/cafe.json b/data/presets/presets/amenity/cafe.json
index 2bde8ed60..75be1725c 100644
--- a/data/presets/presets/amenity/cafe.json
+++ b/data/presets/presets/amenity/cafe.json
@@ -10,7 +10,8 @@
         "internet_access/fee",
         "internet_access/ssid",
         "smoking",
-        "outdoor_seating"
+        "outdoor_seating",
+        "takeaway"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/parking.json b/data/presets/presets/amenity/parking.json
index f26e20d78..df7f37137 100644
--- a/data/presets/presets/amenity/parking.json
+++ b/data/presets/presets/amenity/parking.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-parking",
+    "icon": "maki-car",
     "fields": [
         "name",
         "operator",
@@ -20,6 +20,9 @@
     "tags": {
         "amenity": "parking"
     },
-    "terms": [],
-    "name": "Car Parking"
+    "terms": [
+        "car",
+        "parking lot"
+    ],
+    "name": "Parking Lot"
 }
diff --git a/data/presets/presets/amenity/parking/multi-storey.json b/data/presets/presets/amenity/parking/multi-storey.json
index 6e1fd256a..f8cd7008a 100644
--- a/data/presets/presets/amenity/parking/multi-storey.json
+++ b/data/presets/presets/amenity/parking/multi-storey.json
@@ -1,16 +1,18 @@
 {
-    "icon": "maki-parking-garage",
-    "fields": ["name", "building", "levels", "height", "address"],
-    "geometry": ["area"],
-    "terms": [
-        "multistorey car park",
-        "parking garage",
-        "parkade",
-        "parking structure",
-        "parking ramp",
-        "parking deck",
-        "parking building",
-        "indoor parking"
+    "icon": "maki-car",
+    "fields": [
+        "name",
+        "operator",
+        "building",
+        "levels",
+        "height",
+        "address",
+        "capacity",
+        "fee",
+        "access_simple"
+    ],
+    "geometry": [
+        "area"
     ],
     "tags": {
         "amenity": "parking",
@@ -30,5 +32,16 @@
         "key": "parking",
         "value": "multi-storey"
     },
-    "name": "Multilevel Car Parking"
+    "terms": [
+        "car",
+        "indoor parking",
+        "multistorey car park",
+        "parkade",
+        "parking building",
+        "parking deck",
+        "parking garage",
+        "parking ramp",
+        "parking structure"
+    ],
+    "name": "Multilevel Parking Garage"
 }
diff --git a/data/presets/presets/barrier/kerb.json b/data/presets/presets/barrier/kerb.json
index aff132c00..21fdd6985 100644
--- a/data/presets/presets/barrier/kerb.json
+++ b/data/presets/presets/barrier/kerb.json
@@ -11,5 +11,5 @@
     "tags": {
         "barrier": "kerb"
     },
-    "name": "Kerb"
+    "name": "Curb"
 }
diff --git a/data/presets/presets/barrier/kerb/lowered.json b/data/presets/presets/barrier/kerb/lowered.json
index 98a3b9a56..9054ddc4d 100644
--- a/data/presets/presets/barrier/kerb/lowered.json
+++ b/data/presets/presets/barrier/kerb/lowered.json
@@ -23,5 +23,5 @@
         "dropped kerb",
         "pram ramp"
     ],
-    "name": "Lowered Kerb"
+    "name": "Lowered Curb"
 }
diff --git a/data/presets/presets/highway/speed_camera.json b/data/presets/presets/highway/speed_camera.json
index f35daf8a8..b58332836 100644
--- a/data/presets/presets/highway/speed_camera.json
+++ b/data/presets/presets/highway/speed_camera.json
@@ -6,7 +6,8 @@
     ],
     "fields": [
         "direction",
-        "ref"
+        "ref",
+        "maxspeed"
      ],
     "tags": {
         "highway": "speed_camera"
diff --git a/data/presets/presets/man_made/pipeline.json b/data/presets/presets/man_made/pipeline.json
index 192855517..d198ffc10 100644
--- a/data/presets/presets/man_made/pipeline.json
+++ b/data/presets/presets/man_made/pipeline.json
@@ -9,6 +9,13 @@
     "geometry": [
         "line"
     ],
+    "terms": [
+        "oil",
+        "natural gas",
+        "water",
+        "sewer",
+        "sewage"
+    ],
     "tags": {
         "man_made": "pipeline"
     },
diff --git a/data/presets/presets/piste/downhill.json b/data/presets/presets/piste/downhill.json
index a93097c42..c8e453def 100644
--- a/data/presets/presets/piste/downhill.json
+++ b/data/presets/presets/piste/downhill.json
@@ -2,7 +2,7 @@
     "icon": "maki-skiing",
     "fields": [
         "name",
-        "piste/type_downhill",
+        "piste/type",
         "piste/difficulty_downhill",
         "piste/grooming_downhill",
         "oneway",
diff --git a/data/presets/presets/piste/hike.json b/data/presets/presets/piste/hike.json
index 9376515b7..79aaa6183 100644
--- a/data/presets/presets/piste/hike.json
+++ b/data/presets/presets/piste/hike.json
@@ -2,6 +2,7 @@
     "icon": "fas-snowflake",
     "fields": [
         "name",
+        "piste/type",
         "piste/difficulty",
         "piste/grooming_hike",
         "oneway",
diff --git a/data/presets/presets/piste/ice_skate.json b/data/presets/presets/piste/ice_skate.json
index 4e6a86bde..a64e4854c 100644
--- a/data/presets/presets/piste/ice_skate.json
+++ b/data/presets/presets/piste/ice_skate.json
@@ -2,6 +2,7 @@
     "icon": "fas-snowflake",
     "fields": [
         "name",
+        "piste/type",
         "sport_ice",
         "oneway",
         "lit"
diff --git a/data/presets/presets/piste/nordic.json b/data/presets/presets/piste/nordic.json
index 42a95f751..99d4d17f2 100644
--- a/data/presets/presets/piste/nordic.json
+++ b/data/presets/presets/piste/nordic.json
@@ -2,7 +2,7 @@
     "icon": "maki-skiing",
     "fields": [
         "name",
-        "piste/type_nordic",
+        "piste/type",
         "piste/difficulty_nordic",
         "piste/grooming_nordic",
         "oneway",
diff --git a/data/presets/presets/piste/skitour.json b/data/presets/presets/piste/skitour.json
index a8ab25a0b..831b84fe9 100644
--- a/data/presets/presets/piste/skitour.json
+++ b/data/presets/presets/piste/skitour.json
@@ -2,6 +2,7 @@
     "icon": "maki-skiing",
     "fields": [
         "name",
+        "piste/type",
         "piste/difficulty_skitour",
         "piste/grooming",
         "oneway",
diff --git a/data/presets/presets/piste/sled.json b/data/presets/presets/piste/sled.json
index 594cb743a..d64a55a7b 100644
--- a/data/presets/presets/piste/sled.json
+++ b/data/presets/presets/piste/sled.json
@@ -2,6 +2,7 @@
     "icon": "fas-snowflake",
     "fields": [
         "name",
+        "piste/type",
         "piste/difficulty",
         "piste/grooming",
         "oneway",
diff --git a/data/presets/presets/piste/sleigh.json b/data/presets/presets/piste/sleigh.json
index 8b919c431..dc7c7cd28 100644
--- a/data/presets/presets/piste/sleigh.json
+++ b/data/presets/presets/piste/sleigh.json
@@ -2,6 +2,7 @@
     "icon": "fas-snowflake",
     "fields": [
         "name",
+        "piste/type",
         "piste/difficulty",
         "piste/grooming",
         "oneway",
diff --git a/data/presets/presets/place/city_block.json b/data/presets/presets/place/city_block.json
new file mode 100644
index 000000000..9dcb2d3ed
--- /dev/null
+++ b/data/presets/presets/place/city_block.json
@@ -0,0 +1,14 @@
+{
+    "icon": "maki-triangle-stroked",
+    "fields": [
+        "name"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "place": "city_block"
+    },
+    "name": "City Block"
+}
diff --git a/data/presets/presets/power/cable/underground.json b/data/presets/presets/power/cable/underground.json
new file mode 100644
index 000000000..0d80be672
--- /dev/null
+++ b/data/presets/presets/power/cable/underground.json
@@ -0,0 +1,17 @@
+{
+    "fields": [
+        "name",
+        "operator",
+        "voltage",
+        "ref",
+        "layer"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "power": "cable",
+        "location": "underground"
+    },
+    "name": "Underground Power Cable"
+}
diff --git a/data/presets/presets/power/generator/method/photovoltaic.json b/data/presets/presets/power/generator/method/photovoltaic.json
new file mode 100644
index 000000000..eaecdb820
--- /dev/null
+++ b/data/presets/presets/power/generator/method/photovoltaic.json
@@ -0,0 +1,43 @@
+{
+    "icon": "fas-solar-panel",
+    "fields": [
+        "operator",
+        "generator/output/electricity",
+        "ref"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "terms": [
+        "photovoltaic module",
+        "PV module",
+        "sunlight"
+    ],
+    "tags": {
+        "power": "generator",
+        "generator:source": "solar",
+        "generator:method": "photovoltaic",
+        "generator:type": "solar_photovoltaic_panel"
+    },
+    "addTags": {
+        "power": "generator",
+        "generator:source": "solar",
+        "generator:method": "photovoltaic",
+        "generator:type": "solar_photovoltaic_panel",
+        "generator:output:electricity": "yes"
+    },
+    "removeTags": {
+        "power": "generator",
+        "generator:source": "solar",
+        "generator:method": "photovoltaic",
+        "generator:type": "solar_photovoltaic_panel",
+        "generator:output:electricity": "yes"
+    },
+    "reference": {
+        "key": "generator:method",
+        "value": "photovoltaic"
+    },
+    "name": "Solar Panel"
+}
diff --git a/data/presets/presets/power/generator/source_nuclear.json b/data/presets/presets/power/generator/source/nuclear.json
similarity index 100%
rename from data/presets/presets/power/generator/source_nuclear.json
rename to data/presets/presets/power/generator/source/nuclear.json
diff --git a/data/presets/presets/power/generator/source_wind.json b/data/presets/presets/power/generator/source/wind.json
similarity index 100%
rename from data/presets/presets/power/generator/source_wind.json
rename to data/presets/presets/power/generator/source/wind.json
diff --git a/data/presets/presets/power/tower.json b/data/presets/presets/power/tower.json
index 77c5277fe..eddacdbfd 100644
--- a/data/presets/presets/power/tower.json
+++ b/data/presets/presets/power/tower.json
@@ -4,6 +4,7 @@
         "ref"
     ],
     "geometry": [
+        "point",
         "vertex"
     ],
     "terms": [
diff --git a/data/presets/presets/route/ferry.json b/data/presets/presets/route/ferry.json
index 4a33de905..8be49a069 100644
--- a/data/presets/presets/route/ferry.json
+++ b/data/presets/presets/route/ferry.json
@@ -7,7 +7,9 @@
         "name",
         "operator",
         "duration",
-        "access"
+        "access", 
+        "to", 
+        "from"
     ],
     "tags": {
         "route": "ferry"
diff --git a/data/presets/presets/type/route/bicycle.json b/data/presets/presets/type/route/bicycle.json
index 6efc659a5..2a26657e7 100644
--- a/data/presets/presets/type/route/bicycle.json
+++ b/data/presets/presets/type/route/bicycle.json
@@ -4,7 +4,9 @@
         "name",
         "ref_route",
         "network_bicycle",
-        "cycle_network"
+        "cycle_network",
+        "to", 
+        "from"
     ],
     "geometry": [
         "relation"
diff --git a/data/presets/presets/type/route/bus.json b/data/presets/presets/type/route/bus.json
index b62cc5fc1..8f6b97f2b 100644
--- a/data/presets/presets/type/route/bus.json
+++ b/data/presets/presets/type/route/bus.json
@@ -4,7 +4,9 @@
         "name",
         "ref_route",
         "operator",
-        "network"
+        "network",
+        "to", 
+        "from"
     ],
     "geometry": [
         "relation"
diff --git a/data/presets/presets/type/route/detour.json b/data/presets/presets/type/route/detour.json
index 879ada780..3966df1a9 100644
--- a/data/presets/presets/type/route/detour.json
+++ b/data/presets/presets/type/route/detour.json
@@ -2,7 +2,9 @@
     "icon": "iD-route-detour",
     "fields": [
         "name",
-        "ref_route"
+        "ref_route",
+        "to", 
+        "from"
     ],
     "geometry": [
         "relation"
diff --git a/data/presets/presets/type/route/ferry.json b/data/presets/presets/type/route/ferry.json
index eacec19d8..96c21fe3b 100644
--- a/data/presets/presets/type/route/ferry.json
+++ b/data/presets/presets/type/route/ferry.json
@@ -4,7 +4,9 @@
         "name",
         "ref_route",
         "operator",
-        "network"
+        "network",
+        "to", 
+        "from"
     ],
     "geometry": [
         "relation"
diff --git a/data/presets/presets/type/route/foot.json b/data/presets/presets/type/route/foot.json
index 91c5706be..f8c841a91 100644
--- a/data/presets/presets/type/route/foot.json
+++ b/data/presets/presets/type/route/foot.json
@@ -4,7 +4,9 @@
         "name",
         "ref_route",
         "operator",
-        "network_foot"
+        "network_foot",
+        "to", 
+        "from"
     ],
     "geometry": [
         "relation"
diff --git a/data/presets/presets/type/route/hiking.json b/data/presets/presets/type/route/hiking.json
index db0c04889..a18d19517 100644
--- a/data/presets/presets/type/route/hiking.json
+++ b/data/presets/presets/type/route/hiking.json
@@ -6,7 +6,9 @@
         "operator",
         "network_foot",
         "description",
-        "distance"
+        "distance",
+        "to", 
+        "from"
     ],
     "geometry": [
         "relation"
diff --git a/data/presets/presets/type/route/horse.json b/data/presets/presets/type/route/horse.json
index a524346d8..d4501ff03 100644
--- a/data/presets/presets/type/route/horse.json
+++ b/data/presets/presets/type/route/horse.json
@@ -6,7 +6,9 @@
         "operator",
         "network_horse",
         "description",
-        "distance"
+        "distance",
+        "to", 
+        "from"
     ],
     "geometry": [
         "relation"
diff --git a/data/presets/presets/type/route/light_rail.json b/data/presets/presets/type/route/light_rail.json
index 8bf10a7ad..6e9f505b3 100644
--- a/data/presets/presets/type/route/light_rail.json
+++ b/data/presets/presets/type/route/light_rail.json
@@ -4,7 +4,9 @@
         "name",
         "ref_route",
         "operator",
-        "network"
+        "network",
+        "to", 
+        "from"
     ],
     "geometry": [
         "relation"
diff --git a/data/presets/presets/type/route/pipeline.json b/data/presets/presets/type/route/pipeline.json
index 5f6cadbdc..d15c7547b 100644
--- a/data/presets/presets/type/route/pipeline.json
+++ b/data/presets/presets/type/route/pipeline.json
@@ -3,7 +3,9 @@
     "fields": [
         "name",
         "ref_route",
-        "operator"
+        "operator",
+        "to", 
+        "from"
     ],
     "geometry": [
         "relation"
diff --git a/data/presets/presets/type/route/piste.json b/data/presets/presets/type/route/piste.json
index 42993a796..7f478bd04 100644
--- a/data/presets/presets/type/route/piste.json
+++ b/data/presets/presets/type/route/piste.json
@@ -5,7 +5,9 @@
         "piste/type",
         "colour",
         "ref_route",
-        "operator"
+        "operator",
+        "to", 
+        "from"
     ],
     "geometry": [
         "relation"
diff --git a/data/presets/presets/type/route/power.json b/data/presets/presets/type/route/power.json
index d3f4d1865..9689d02bb 100644
--- a/data/presets/presets/type/route/power.json
+++ b/data/presets/presets/type/route/power.json
@@ -3,7 +3,9 @@
     "fields": [
         "name",
         "ref_route",
-        "operator"
+        "operator",
+        "to", 
+        "from"
     ],
     "geometry": [
         "relation"
diff --git a/data/presets/presets/type/route/road.json b/data/presets/presets/type/route/road.json
index 875c1d57c..21908c406 100644
--- a/data/presets/presets/type/route/road.json
+++ b/data/presets/presets/type/route/road.json
@@ -3,7 +3,9 @@
     "fields": [
         "name",
         "ref_route",
-        "network_road"
+        "network_road",
+        "to", 
+        "from"
     ],
     "geometry": [
         "relation"
diff --git a/data/presets/presets/type/route/subway.json b/data/presets/presets/type/route/subway.json
index 013bd804c..209b63c72 100644
--- a/data/presets/presets/type/route/subway.json
+++ b/data/presets/presets/type/route/subway.json
@@ -4,7 +4,9 @@
         "name",
         "ref_route",
         "operator",
-        "network"
+        "network",
+        "to", 
+        "from"
     ],
     "geometry": [
         "relation"
diff --git a/data/presets/presets/type/route/train.json b/data/presets/presets/type/route/train.json
index 64d740478..d4766262c 100644
--- a/data/presets/presets/type/route/train.json
+++ b/data/presets/presets/type/route/train.json
@@ -4,7 +4,9 @@
         "name",
         "ref_route",
         "operator",
-        "network"
+        "network",
+        "to", 
+        "from"
     ],
     "geometry": [
         "relation"
diff --git a/data/presets/presets/type/route/tram.json b/data/presets/presets/type/route/tram.json
index 0706d2b68..3970a1ac2 100644
--- a/data/presets/presets/type/route/tram.json
+++ b/data/presets/presets/type/route/tram.json
@@ -4,7 +4,9 @@
         "name",
         "ref_route",
         "operator",
-        "network"
+        "network",
+        "to", 
+        "from"
     ],
     "geometry": [
         "relation"
diff --git a/data/taginfo.json b/data/taginfo.json
index 53898b487..0a67645da 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -703,16 +703,16 @@
     {
       "key": "amenity",
       "value": "parking",
-      "description": "Car Parking",
+      "description": "Parking Lot",
       "object_types": ["node", "area"],
-      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/parking-15.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"
     },
     {
       "key": "parking",
       "value": "multi-storey",
-      "description": "Multilevel Car Parking, Type",
+      "description": "Multilevel Parking Garage, Type",
       "object_types": ["area"],
-      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/parking-garage-15.svg?sanitize=true"
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"
     },
     {
       "key": "amenity",
@@ -1404,14 +1404,14 @@
     {
       "key": "barrier",
       "value": "kerb",
-      "description": "Kerb",
+      "description": "Curb",
       "object_types": ["node", "way"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/wheelchair-15.svg?sanitize=true"
     },
     {
       "key": "kerb",
       "value": "lowered",
-      "description": "Lowered Kerb",
+      "description": "Lowered Curb",
       "object_types": ["node", "way"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/wheelchair-15.svg?sanitize=true"
     },
@@ -4480,6 +4480,13 @@
       "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/farm-15.svg?sanitize=true"
     },
+    {
+      "key": "place",
+      "value": "city_block",
+      "description": "City Block",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/triangle-stroked-15.svg?sanitize=true"
+    },
     {
       "key": "place",
       "value": "city",
@@ -4675,6 +4682,12 @@
       "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/power.svg?sanitize=true"
     },
+    {
+      "key": "location",
+      "value": "underground",
+      "description": "Underground Power Cable",
+      "object_types": ["way"]
+    },
     {
       "key": "power",
       "value": "generator",
@@ -4682,6 +4695,13 @@
       "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/power.svg?sanitize=true"
     },
+    {
+      "key": "generator:type",
+      "value": "solar_photovoltaic_panel",
+      "description": "Solar Panel",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-solar-panel.svg?sanitize=true"
+    },
     {
       "key": "generator:method",
       "value": "fission",
@@ -5030,13 +5050,13 @@
     {
       "key": "seamark:buoy_lateral:colour",
       "value": "green",
-      "description": "Green Buoy, Colour",
+      "description": "Green Buoy, Color",
       "object_types": ["node"]
     },
     {
       "key": "seamark:buoy_lateral:colour",
       "value": "red",
-      "description": "Red Buoy, Colour",
+      "description": "Red Buoy, Color",
       "object_types": ["node"]
     },
     {
@@ -6695,7 +6715,7 @@
     {"key": "castle_type", "description": "Type"},
     {"key": "clothes", "description": "Clothes"},
     {"key": "collection_times", "description": "Collection Times"},
-    {"key": "colour", "description": "Colour"},
+    {"key": "colour", "description": "Color"},
     {"key": "comment", "description": "Changeset Comment"},
     {"key": "communication:", "description": "Communication Types"},
     {"key": "construction", "description": "Type"},
@@ -6853,6 +6873,7 @@
     {"key": "flag:type", "description": "Flag Type"},
     {"key": "ford", "description": "Type"},
     {"key": "frequency", "description": "Operating Frequency"},
+    {"key": "from", "description": "From"},
     {"key": "fuel:", "description": "Fuel Types"},
     {"key": "fuel", "description": "Fuel"},
     {"key": "gauge", "description": "Gauge"},
@@ -7250,17 +7271,17 @@
     {
       "key": "seamark:beacon_lateral:colour",
       "value": "red",
-      "description": "Colour"
+      "description": "Color"
     },
     {
       "key": "seamark:beacon_lateral:colour",
       "value": "green",
-      "description": "Colour"
+      "description": "Color"
     },
     {
       "key": "seamark:beacon_lateral:colour",
       "value": "grey",
-      "description": "Colour"
+      "description": "Color"
     },
     {"key": "seamark:beacon_lateral:shape", "description": "Shape"},
     {
@@ -7336,32 +7357,32 @@
     {
       "key": "seamark:buoy_lateral:colour",
       "value": "red;white;red;white",
-      "description": "Colour"
+      "description": "Color"
     },
     {
       "key": "seamark:buoy_lateral:colour",
       "value": "green;white;green;white",
-      "description": "Colour"
+      "description": "Color"
     },
     {
       "key": "seamark:buoy_lateral:colour",
       "value": "red;green;red",
-      "description": "Colour"
+      "description": "Color"
     },
     {
       "key": "seamark:buoy_lateral:colour",
       "value": "green;red;green",
-      "description": "Colour"
+      "description": "Color"
     },
     {
       "key": "seamark:buoy_lateral:colour",
       "value": "white",
-      "description": "Colour"
+      "description": "Color"
     },
     {
       "key": "seamark:buoy_lateral:colour",
       "value": "yellow",
-      "description": "Colour"
+      "description": "Color"
     },
     {"key": "seamark:buoy_lateral:shape", "description": "Shape"},
     {
@@ -7387,6 +7408,7 @@
     {"key": "seamark:mooring:category", "description": "Category"},
     {"key": "seamark:wreck:category", "description": "Category"},
     {"key": "seasonal", "description": "Seasonal"},
+    {"key": "seats", "description": "Seats"},
     {"key": "second_hand", "value": "yes", "description": "Sells Used"},
     {"key": "second_hand", "value": "no", "description": "Sells Used"},
     {"key": "second_hand", "value": "only", "description": "Sells Used"},
@@ -7485,6 +7507,7 @@
     {"key": "takeaway", "value": "yes", "description": "Takeaway"},
     {"key": "takeaway", "value": "no", "description": "Takeaway"},
     {"key": "takeaway", "value": "only", "description": "Takeaway"},
+    {"key": "to", "description": "To"},
     {"key": "toilets:disposal", "value": "flush", "description": "Disposal"},
     {
       "key": "toilets:disposal",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 86f5b59c3..b1dc1189d 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1,9 +1,11 @@
 {
     "en": {
         "icons": {
+            "download": "download",
             "information": "info",
             "remove": "remove",
-            "undo": "undo"
+            "undo": "undo",
+            "zoom_to": "zoom to"
         },
         "modes": {
             "add_area": {
@@ -1455,6 +1457,9 @@
                 "category-route": {
                     "name": "Route Features"
                 },
+                "category-utility": {
+                    "name": "Utility Features"
+                },
                 "category-water-area": {
                     "name": "Water Features"
                 },
@@ -1731,7 +1736,7 @@
                     "label": "Collection Times"
                 },
                 "colour": {
-                    "label": "Colour"
+                    "label": "Color"
                 },
                 "comment": {
                     "label": "Changeset Comment",
@@ -1999,6 +2004,9 @@
                 "frequency": {
                     "label": "Operating Frequency"
                 },
+                "from": {
+                    "label": "From"
+                },
                 "fuel_multi": {
                     "label": "Fuel Types"
                 },
@@ -2516,23 +2524,6 @@
                         "skating": "Skating"
                     }
                 },
-                "piste/type_downhill": {
-                    "label": "Type",
-                    "options": {
-                        "downhill": "Downhill",
-                        "snow_park": "Snow Park",
-                        "playground": "Playground",
-                        "connection": "Connection between pistes"
-                    }
-                },
-                "piste/type_nordic": {
-                    "label": "Type",
-                    "options": {
-                        "downhill": "Nordic",
-                        "playground": "Playground",
-                        "connection": "Connection between pistes"
-                    }
-                },
                 "piste/type": {
                     "label": "Type",
                     "options": {
@@ -2698,7 +2689,7 @@
                     }
                 },
                 "seamark/beacon_lateral/colour": {
-                    "label": "Colour",
+                    "label": "Color",
                     "options": {
                         "red": "Red",
                         "green": "Green",
@@ -2733,7 +2724,7 @@
                     }
                 },
                 "seamark/buoy_lateral/colour": {
-                    "label": "Colour",
+                    "label": "Color",
                     "options": {
                         "red": "Red",
                         "green": "Green",
@@ -2769,6 +2760,10 @@
                 "seasonal": {
                     "label": "Seasonal"
                 },
+                "seats": {
+                    "label": "Seats",
+                    "placeholder": "2, 4, 6..."
+                },
                 "second_hand": {
                     "label": "Sells Used",
                     "placeholder": "Yes, No, Only",
@@ -2962,6 +2957,9 @@
                         "only": "Takeaway Only"
                     }
                 },
+                "to": {
+                    "label": "To"
+                },
                 "toilets/disposal": {
                     "label": "Disposal",
                     "options": {
@@ -3577,12 +3575,12 @@
                     "terms": ""
                 },
                 "amenity/parking": {
-                    "name": "Car Parking",
-                    "terms": ""
+                    "name": "Parking Lot",
+                    "terms": "car,parking lot"
                 },
                 "amenity/parking/multi-storey": {
-                    "name": "Multilevel Car Parking",
-                    "terms": "multistorey car park,parking garage,parkade,parking structure,parking ramp,parking deck,parking building,indoor parking"
+                    "name": "Multilevel Parking Garage",
+                    "terms": "car,indoor parking,multistorey car park,parkade,parking building,parking deck,parking garage,parking ramp,parking structure"
                 },
                 "amenity/pharmacy": {
                     "name": "Pharmacy",
@@ -3985,11 +3983,11 @@
                     "terms": ""
                 },
                 "barrier/kerb": {
-                    "name": "Kerb",
+                    "name": "Curb",
                     "terms": ""
                 },
                 "barrier/kerb/lowered": {
-                    "name": "Lowered Kerb",
+                    "name": "Lowered Curb",
                     "terms": "curb cut,curb ramp,kerb ramp,dropped kerb,pram ramp"
                 },
                 "barrier/kissing_gate": {
@@ -5450,7 +5448,7 @@
                 },
                 "man_made/pipeline": {
                     "name": "Pipeline",
-                    "terms": ""
+                    "terms": "oil,natural gas,water,sewer,sewage"
                 },
                 "man_made/pumping_station": {
                     "name": "Pumping Station",
@@ -5836,6 +5834,10 @@
                     "name": "Farm",
                     "terms": ""
                 },
+                "place/city_block": {
+                    "name": "City Block",
+                    "terms": ""
+                },
                 "place/city": {
                     "name": "City",
                     "terms": ""
@@ -5952,15 +5954,23 @@
                     "name": "Substation",
                     "terms": ""
                 },
+                "power/cable/underground": {
+                    "name": "Underground Power Cable",
+                    "terms": ""
+                },
                 "power/generator": {
                     "name": "Power Generator",
                     "terms": "hydro,solar,turbine,wind"
                 },
-                "power/generator/source_nuclear": {
+                "power/generator/method/photovoltaic": {
+                    "name": "Solar Panel",
+                    "terms": "photovoltaic module,PV module,sunlight"
+                },
+                "power/generator/source/nuclear": {
                     "name": "Nuclear Reactor",
                     "terms": "fission,generator,nuclear,nuke,reactor"
                 },
-                "power/generator/source_wind": {
+                "power/generator/source/wind": {
                     "name": "Wind Turbine",
                     "terms": "generator,turbine,windmill,wind"
                 },
diff --git a/modules/modes/add_point.js b/modules/modes/add_point.js
index 678be7c68..89623a012 100644
--- a/modules/modes/add_point.js
+++ b/modules/modes/add_point.js
@@ -3,6 +3,7 @@ import { actionAddEntity } from '../actions';
 import { behaviorDraw } from '../behavior';
 import { modeBrowse, modeSelect } from './index';
 import { osmNode } from '../osm';
+import { actionAddMidpoint } from '../actions';
 
 
 export function modeAddPoint(context) {
@@ -37,8 +38,17 @@ export function modeAddPoint(context) {
     }
 
 
-    function addWay(loc) {
-        add(loc);
+    function addWay(loc, edge) {
+        var node =  osmNode();
+
+        context.perform(
+            actionAddMidpoint({loc: loc, edge: edge}, node),
+            t('operations.add.annotation.vertex')
+        );
+
+        context.enter(
+            modeSelect(context, [node.id]).newFeature(true)
+        );
     }
 
 
diff --git a/modules/services/mapillary.js b/modules/services/mapillary.js
index 8be72b3f1..77d516a6d 100644
--- a/modules/services/mapillary.js
+++ b/modules/services/mapillary.js
@@ -335,7 +335,7 @@ export default {
     loadSigns: function(context, projection) {
         // if we are looking at signs, we'll actually need to fetch images too
         loadTiles('images', apibase + 'images?', projection);
-        loadTiles('objects', apibase + 'objects?', projection);
+        loadTiles('objects', apibase + 'map_features?layers=trafficsigns&', projection);
     },
 
 
@@ -636,7 +636,7 @@ export default {
 
 
         function loadDetection(detectionKey) {
-            var url = apibase + 'detections/' +
+            var url = apibase + 'image_detections/' +
                     detectionKey + '?' + utilQsString({ client_id: clientId });
 
             d3_request(url)
diff --git a/modules/services/taginfo.js b/modules/services/taginfo.js
index cc8df7041..6242be845 100644
--- a/modules/services/taginfo.js
+++ b/modules/services/taginfo.js
@@ -182,7 +182,9 @@ export default {
     init: function() {
         inflight = {};
         taginfoCache = {};
-        popularKeys = {};
+        popularKeys = {
+            postal_code: true   // #5377
+        };
 
         // Fetch popular keys.  We'll exclude these from `values`
         // lookups because they stress taginfo, and they aren't likely
diff --git a/modules/svg/tag_classes.js b/modules/svg/tag_classes.js
index 461fb14c3..7d547be43 100644
--- a/modules/svg/tag_classes.js
+++ b/modules/svg/tag_classes.js
@@ -6,7 +6,7 @@ export function svgTagClasses() {
     var primaries = [
         'building', 'highway', 'railway', 'waterway', 'aeroway',
         'motorway', 'boundary', 'power', 'amenity', 'natural', 'landuse',
-        'leisure', 'military', 'place', 'man_made', 'attraction'
+        'leisure', 'military', 'place', 'man_made', 'route', 'attraction'
     ];
     var statuses = [
         'proposed', 'construction', 'disused', 'abandoned', 'dismantled',
@@ -15,7 +15,7 @@ export function svgTagClasses() {
     var secondaries = [
         'oneway', 'bridge', 'tunnel', 'embankment', 'cutting', 'barrier',
         'surface', 'tracktype', 'footway', 'crossing', 'service', 'sport',
-        'public_transport'
+        'public_transport', 'location', 'parking'
     ];
     var tagClassRe = /^tag-/;
     var _tags = function(entity) { return entity.tags; };
diff --git a/modules/ui/help.js b/modules/ui/help.js
index 29942ca2a..a8b5bbbbd 100644
--- a/modules/ui/help.js
+++ b/modules/ui/help.js
@@ -318,7 +318,7 @@ export function uiHelp(context) {
 
         function clickHelp(d, i) {
             var rtl = (textDirection === 'rtl');
-            pane.property('scrollTop', 0);
+            content.property('scrollTop', 0);
             doctitle.html(d.title);
 
             body.html(d.html);
diff --git a/modules/ui/preset_list.js b/modules/ui/preset_list.js
index 3360aeb8c..1242e2fe2 100644
--- a/modules/ui/preset_list.js
+++ b/modules/ui/preset_list.js
@@ -61,7 +61,7 @@ export function uiPresetList(context) {
                 .call(svgIcon('#iD-icon-close'));
         }
 
-        function keydown() {
+        function initialKeydown() {
             // hack to let delete shortcut work when search is autofocused
             if (search.property('value').length === 0 &&
                 (d3_event.keyCode === d3_keybinding.keyCodes['⌫'] ||
@@ -69,6 +69,8 @@ export function uiPresetList(context) {
                 d3_event.preventDefault();
                 d3_event.stopPropagation();
                 operationDelete([id], context)();
+
+            // hack to let undo work when search is autofocused
             } else if (search.property('value').length === 0 &&
                 (d3_event.ctrlKey || d3_event.metaKey) &&
                 d3_event.keyCode === d3_keybinding.keyCodes.z) {
@@ -76,7 +78,21 @@ export function uiPresetList(context) {
                 d3_event.stopPropagation();
                 context.undo();
             } else if (!d3_event.ctrlKey && !d3_event.metaKey) {
-                d3_select(this).on('keydown', null);
+                // don't check for delete/undo hack on future keydown events
+                d3_select(this).on('keydown', keydown);
+                keydown.call(this);
+            }
+        }
+
+        function keydown() {
+            // down arrow
+            if (d3_event.keyCode === d3_keybinding.keyCodes['↓'] &&
+                // if insertion point is at the end of the string
+                search.node().selectionStart === search.property('value').length) {
+                d3_event.preventDefault();
+                d3_event.stopPropagation();
+                // move focus to the first item in the preset list
+                list.select('.preset-list-button').node().focus();
             }
         }
 
@@ -114,7 +130,7 @@ export function uiPresetList(context) {
             .attr('placeholder', t('inspector.search'))
             .attr('type', 'search')
             .call(utilNoAuto)
-            .on('keydown', keydown)
+            .on('keydown', initialKeydown)
             .on('keypress', keypress)
             .on('input', inputevent);
 
@@ -159,6 +175,84 @@ export function uiPresetList(context) {
             .style('opacity', 1);
     }
 
+    function itemKeydown(){
+        // the actively focused item
+        var item = d3_select(this.closest('.preset-list-item'));
+        var parentItem = d3_select(item.node().parentElement.closest('.preset-list-item'));
+
+        // arrow down, move focus to the next, lower item
+        if (d3_event.keyCode === d3_keybinding.keyCodes['↓']) {
+            d3_event.preventDefault();
+            d3_event.stopPropagation();
+            // the next item in the list at the same level
+            var nextItem = d3_select(item.node().nextElementSibling);
+            // if there is no next item in this list
+            if (nextItem.empty()) {
+                // if there is a parent item
+                if (!parentItem.empty()) {
+                    // the item is the last item of a sublist,
+                    // select the next item at the parent level
+                    nextItem = d3_select(parentItem.node().nextElementSibling);
+                }
+            // if the focused item is expanded
+            } else if (d3_select(this).classed('expanded')) {
+                // select the first subitem instead
+                nextItem = item.select('.subgrid .preset-list-item:first-child');
+            }
+            if (!nextItem.empty()) {
+                // focus on the next item
+                nextItem.select('.preset-list-button').node().focus();
+            }
+
+        // arrow up, move focus to the previous, higher item
+        } else if (d3_event.keyCode === d3_keybinding.keyCodes['↑']) {
+            d3_event.preventDefault();
+            d3_event.stopPropagation();
+            // the previous item in the list at the same level
+            var previousItem = d3_select(item.node().previousElementSibling);
+
+            // if there is no previous item in this list
+            if (previousItem.empty()) {
+                // if there is a parent item
+                if (!parentItem.empty()) {
+                    // the item is the first subitem of a sublist,
+                    // select the parent item
+                    previousItem = parentItem;
+                }
+            // if the previous item is expanded
+            } else if (previousItem.select('.preset-list-button').classed('expanded')) {
+                // select the last subitem of the sublist of the previous item
+                previousItem = previousItem.select('.subgrid .preset-list-item:last-child');
+            }
+            if (!previousItem.empty()) {
+                // focus on the previous item
+                previousItem.select('.preset-list-button').node().focus();
+            }
+            else {
+                // the focus is at the top of the list, move focus back to the search field
+                var search = d3_select(this.closest('.preset-list-pane')).select('.preset-search-input');
+                search.node().focus();
+            }
+        }
+        // arrow left, move focus to the parent item if there is one
+        else if (d3_event.keyCode === d3_keybinding.keyCodes[(textDirection === 'rtl') ? '→' : '←']) {
+            d3_event.preventDefault();
+            d3_event.stopPropagation();
+
+            // if there is a parent item
+            if (!parentItem.empty()) {
+                // focus on the parent item
+                parentItem.select('.preset-list-button').node().focus();
+            }
+        }
+        // arrow right, choose this item
+        else if (d3_event.keyCode === d3_keybinding.keyCodes[(textDirection === 'rtl') ? '←' : '→']) {
+            d3_event.preventDefault();
+            d3_event.stopPropagation();
+            item.datum().choose();
+        }
+    }
+
 
     function CategoryItem(preset) {
         var box, sublist, shown = false;
@@ -167,6 +261,17 @@ export function uiPresetList(context) {
             var wrap = selection.append('div')
                 .attr('class', 'preset-list-button-wrap category col12');
 
+            function click() {
+                var isExpanded = d3_select(this).classed('expanded');
+                var iconName = isExpanded ?
+                    (textDirection === 'rtl' ? '#iD-icon-backward' : '#iD-icon-forward') : '#iD-icon-down';
+                d3_select(this)
+                    .classed('expanded', !isExpanded);
+                d3_select(this).selectAll('div.label svg.icon use')
+                    .attr('href', iconName);
+                item.choose();
+            }
+
             var button = wrap
                 .append('button')
                 .attr('class', 'preset-list-button')
@@ -174,15 +279,29 @@ export function uiPresetList(context) {
                 .call(uiPresetIcon()
                     .geometry(context.geometry(id))
                     .preset(preset))
-                .on('click', function() {
-                    var isExpanded = d3_select(this).classed('expanded');
-                    var iconName = isExpanded ?
-                        (textDirection === 'rtl' ? '#iD-icon-backward' : '#iD-icon-forward') : '#iD-icon-down';
-                    d3_select(this)
-                        .classed('expanded', !isExpanded);
-                    d3_select(this).selectAll('div.label svg.icon use')
-                        .attr('href', iconName);
-                    item.choose();
+                .on('click', click)
+                .on('keydown', function() {
+                    // right arrow, expand the focused item
+                    if (d3_event.keyCode === d3_keybinding.keyCodes[(textDirection === 'rtl') ? '←' : '→']) {
+                        d3_event.preventDefault();
+                        d3_event.stopPropagation();
+                        // if the item isn't expanded
+                        if (!d3_select(this).classed('expanded')) {
+                            // toggle expansion (expand the item)
+                            click.call(this);
+                        }
+                    // left arrow, collapse the focused item
+                    } else if (d3_event.keyCode === d3_keybinding.keyCodes[(textDirection === 'rtl') ? '→' : '←']) {
+                        d3_event.preventDefault();
+                        d3_event.stopPropagation();
+                        // if the item is expanded
+                        if (d3_select(this).classed('expanded')) {
+                            // toggle expansion (collapse the item)
+                            click.call(this);
+                        }
+                    } else {
+                        itemKeydown.call(this);
+                    }
                 });
 
             var label = button
@@ -245,6 +364,7 @@ export function uiPresetList(context) {
                     .geometry(context.geometry(id))
                     .preset(preset))
                 .on('click', item.choose)
+                .on('keydown', itemKeydown)
                 .append('div')
                 .attr('class', 'label')
                 .text(preset.name());
diff --git a/modules/ui/raw_member_editor.js b/modules/ui/raw_member_editor.js
index 3d61148ab..0d1080dca 100644
--- a/modules/ui/raw_member_editor.js
+++ b/modules/ui/raw_member_editor.js
@@ -15,7 +15,8 @@ import { uiDisclosure } from './disclosure';
 import {
     utilDisplayName,
     utilDisplayType,
-    utilNoAuto
+    utilNoAuto,
+    utilHighlightEntity
 } from '../util';
 
 
@@ -23,9 +24,34 @@ export function uiRawMemberEditor(context) {
     var taginfo = services.taginfo,
         _entityID;
 
+    function downloadMember(d) {
+        d3_event.preventDefault();
+        // display the loading indicator
+        d3_select(this.parentNode).classed('tag-reference-loading', true);
+        context.loadEntity(d.id);
+    }
+
+    function zoomToMember(d) {
+        d3_event.preventDefault();
+
+        var entity = context.entity(d.id);
+        context.map().zoomTo(entity);
+
+        // highlight the feature in case it wasn't previously on-screen
+        utilHighlightEntity(d.id, true, context);
+    }
+
 
     function selectMember(d) {
         d3_event.preventDefault();
+
+        var entity = context.entity(d.id);
+        var mapExtent = context.map().extent();
+        if (!entity.intersects(mapExtent, context.graph())) {
+            // zoom to the entity if its extent is not visible now
+            context.map().zoomTo(entity);
+        }
+
         context.enter(modeSelect(context, [d.id]));
     }
 
@@ -107,27 +133,64 @@ export function uiRawMemberEditor(context) {
             enter
                 .each(function(d) {
                     if (d.member) {
+
+                        // highlight the member feature in the map while hovering on the list item
+                        d3_select(this).on('mouseover', function() {
+                            utilHighlightEntity(d.id, true, context);
+                        });
+                        d3_select(this).on('mouseout', function() {
+                            utilHighlightEntity(d.id, false, context);
+                        });
+
                         var label = d3_select(this).append('label')
-                            .attr('class', 'form-label')
-                            .append('a')
+                            .attr('class', 'form-label');
+
+                        var labelLink = label.append('a')
                             .attr('href', '#')
                             .on('click', selectMember);
 
-                        label.append('span')
+                        labelLink.append('span')
                             .attr('class', 'member-entity-type')
                             .text(function(d) {
                                 var matched = context.presets().match(d.member, context.graph());
                                 return (matched && matched.name()) || utilDisplayType(d.member.id);
                             });
 
-                        label.append('span')
+                        labelLink.append('span')
                             .attr('class', 'member-entity-name')
                             .text(function(d) { return utilDisplayName(d.member); });
 
+                        var buttonWrap = label.append('div')
+                            .attr('class', 'form-label-button-wrap');
+
+                        buttonWrap.append('button')
+                            .attr('class', 'download-icon')
+                            .attr('title', t('icons.zoom_to'))
+                            .attr('tabindex', -1)
+                            .call(svgIcon('#iD-icon-geolocate'))
+                            .on('click', zoomToMember);
+
                     } else {
-                        d3_select(this).append('label')
-                            .attr('class', 'form-label')
+                        var incompleteLabel = d3_select(this).append('label')
+                            .attr('class', 'form-label');
+
+                        incompleteLabel.append('span')
+                            .attr('class', 'member-entity-type')
+                            .text(t('inspector.'+d.type, { id: d.id }));
+
+                        incompleteLabel.append('span')
+                            .attr('class', 'member-entity-name')
                             .text(t('inspector.incomplete', { id: d.id }));
+
+                        var wrap = incompleteLabel.append('div')
+                            .attr('class', 'form-label-button-wrap');
+
+                        wrap.append('button')
+                            .attr('class', 'download-icon')
+                            .attr('title', t('icons.download'))
+                            .attr('tabindex', -1)
+                            .call(svgIcon('#iD-icon-load'))
+                            .on('click', downloadMember);
                     }
                 });
 
@@ -144,6 +207,7 @@ export function uiRawMemberEditor(context) {
             enter
                 .append('button')
                 .attr('tabindex', -1)
+                .attr('title', t('icons.remove'))
                 .attr('class', 'remove button-input-action member-delete minor')
                 .on('click', deleteMember)
                 .call(svgIcon('#iD-operation-delete'));
diff --git a/modules/ui/raw_membership_editor.js b/modules/ui/raw_membership_editor.js
index 0fadc1b7b..f856cd7ab 100644
--- a/modules/ui/raw_membership_editor.js
+++ b/modules/ui/raw_membership_editor.js
@@ -24,7 +24,7 @@ import { osmEntity, osmRelation } from '../osm';
 import { services } from '../services';
 import { svgIcon } from '../svg';
 import { uiDisclosure } from './disclosure';
-import { utilDisplayName, utilNoAuto } from '../util';
+import { utilDisplayName, utilNoAuto, utilHighlightEntity } from '../util';
 
 
 export function uiRawMembershipEditor(context) {
@@ -173,6 +173,16 @@ export function uiRawMembershipEditor(context) {
                 .append('li')
                 .attr('class', 'member-row member-row-normal form-field');
 
+            enter.each(function(d){
+                // highlight the relation in the map while hovering on the list item
+                d3_select(this).on('mouseover', function() {
+                    utilHighlightEntity(d.relation.id, true, context);
+                });
+                d3_select(this).on('mouseout', function() {
+                    utilHighlightEntity(d.relation.id, false, context);
+                });
+            });
+
             var label = enter
                 .append('label')
                 .attr('class', 'form-label')
diff --git a/modules/ui/selection_list.js b/modules/ui/selection_list.js
index 150974962..f7f3a3ee7 100644
--- a/modules/ui/selection_list.js
+++ b/modules/ui/selection_list.js
@@ -1,10 +1,13 @@
-import { event as d3_event } from 'd3-selection';
+import {
+    event as d3_event,
+    select as d3_select
+} from 'd3-selection';
 
 import { t } from '../util/locale';
 import { modeSelect } from '../modes';
 import { osmEntity } from '../osm';
 import { svgIcon } from '../svg';
-import { utilDisplayName } from '../util';
+import { utilDisplayName, utilHighlightEntity } from '../util';
 
 
 export function uiSelectionList(context, selectedIDs) {
@@ -64,6 +67,17 @@ export function uiSelectionList(context, selectedIDs) {
                 .attr('class', 'feature-list-item')
                 .on('click', selectEntity);
 
+            enter
+                .each(function(d) {
+                // highlight the feature in the map while hovering on the list item
+                d3_select(this).on('mouseover', function() {
+                    utilHighlightEntity(d.id, true, context);
+                });
+                d3_select(this).on('mouseout', function() {
+                    utilHighlightEntity(d.id, false, context);
+                });
+            });
+
             var label = enter
                 .append('button')
                 .attr('class', 'label');
diff --git a/modules/util/index.js b/modules/util/index.js
index 16460cd14..a0269240f 100644
--- a/modules/util/index.js
+++ b/modules/util/index.js
@@ -7,12 +7,14 @@ export { utilDisplayType } from './util';
 export { utilEditDistance } from './util';
 export { utilEntitySelector } from './util';
 export { utilEntityOrMemberSelector } from './util';
+export { utilEntityOrDeepMemberSelector } from './util';
 export { utilFastMouse } from './util';
 export { utilFunctor } from './util';
 export { utilGetAllNodes } from './util';
 export { utilGetPrototypeOf } from './util';
 export { utilGetSetValue } from './get_set_value';
 export { utilHashcode } from './util';
+export { utilHighlightEntity } from './util';
 export { utilIdleWorker } from './idle_worker';
 export { utilNoAuto } from './util';
 export { utilPrefixCSSProperty } from './util';
diff --git a/modules/util/util.js b/modules/util/util.js
index 6b03c9f4c..5eb821ced 100644
--- a/modules/util/util.js
+++ b/modules/util/util.js
@@ -34,6 +34,32 @@ export function utilEntityOrMemberSelector(ids, graph) {
 }
 
 
+export function utilEntityOrDeepMemberSelector(ids, graph) {
+    var seen = {};
+    var allIDs = [];
+    function addEntityAndMembersIfNotYetSeen(id) {
+        // avoid infinite recursion for circular relations by skipping seen entities
+        if (seen[id]) return;
+        // mark the entity as seen
+        seen[id] = true;
+        // add the id;
+        allIDs.push(id);
+        if (graph.hasEntity(id)) {
+            var entity = graph.entity(id);
+            if (entity.type === 'relation' && entity.members) {
+                entity.members.forEach(function(member){
+                    addEntityAndMembersIfNotYetSeen(member.id);
+                });
+            }
+        }
+    }
+    ids.forEach(function(id) {
+        addEntityAndMembersIfNotYetSeen(id);
+    });
+    return utilEntitySelector(allIDs);
+}
+
+
 export function utilGetAllNodes(ids, graph) {
     var seen = {};
     var nodes = [];
@@ -282,3 +308,10 @@ export function utilHashcode(str) {
     }
     return hash;
 }
+
+// Adds or removes highlight styling for the specified entity's SVG elements in the map.
+export function utilHighlightEntity(id, highlighted, context) {
+    context.surface()
+        .selectAll(utilEntityOrDeepMemberSelector([id], context.graph()))
+        .classed('highlighted', highlighted);
+}
diff --git a/package.json b/package.json
index 4dd97c03f..7e05e92fd 100644
--- a/package.json
+++ b/package.json
@@ -49,10 +49,10 @@
     "wmf-sitematrix": "0.1.4"
   },
   "devDependencies": {
-    "@fortawesome/fontawesome-svg-core": "~1.2.4",
-    "@fortawesome/free-brands-svg-icons": "~5.3.1",
-    "@fortawesome/free-regular-svg-icons": "~5.3.1",
-    "@fortawesome/free-solid-svg-icons": "~5.3.1",
+    "@fortawesome/fontawesome-svg-core": "~1.2.5",
+    "@fortawesome/free-brands-svg-icons": "~5.4.0",
+    "@fortawesome/free-regular-svg-icons": "~5.4.0",
+    "@fortawesome/free-solid-svg-icons": "~5.4.0",
     "@mapbox/maki": "^4.0.0",
     "chai": "^4.1.0",
     "colors": "^1.1.2",
diff --git a/svg/fontawesome/fas-snowflake.svg b/svg/fontawesome/fas-snowflake.svg
new file mode 100644
index 000000000..a162d4179
--- /dev/null
+++ b/svg/fontawesome/fas-snowflake.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" data-prefix="fas" data-icon="snowflake" class="svg-inline--fa fa-snowflake fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M444.816 301.639a24.12 24.12 0 0 0 2.661-16.978c-2.725-12.966-15.339-21.245-28.174-18.492l-87.407 25.046L264 256l67.896-35.215 87.407 25.046c12.835 2.753 25.449-5.526 28.174-18.492 2.725-12.966-5.471-25.708-18.305-28.461l-47.477-7.137 53.077-30.956c11.363-6.627 15.257-21.306 8.696-32.785-6.561-11.479-21.091-15.412-32.454-8.785l-53.077 30.956 17.621-45.104c4.057-12.606-2.768-26.146-15.247-30.245-12.478-4.099-25.883 2.797-29.94 15.402l-22.232 88.99-60.38 35.215V144l65.175-63.945c8.778-9.852 7.987-25.027-1.766-33.894-9.753-8.867-24.775-8.068-33.552 1.784l-29.857 37.967V24c0-13.255-10.637-24-23.758-24s-23.758 10.745-23.758 24v61.912l-29.857-37.967c-8.779-9.852-23.799-10.652-33.552-1.784-9.753 8.867-10.543 24.042-1.766 33.894L200.242 144v70.431l-60.38-35.215-22.232-88.99c-4.057-12.605-17.462-19.501-29.94-15.402-12.478 4.099-19.304 17.64-15.247 30.245l17.62 45.104-53.077-30.956c-11.363-6.627-25.893-2.694-32.454 8.785s-2.667 26.157 8.696 32.785l53.077 30.956-47.477 7.137C5.993 201.634-2.203 214.375.523 227.341c2.725 12.965 15.339 21.245 28.174 18.492l87.407-25.046L184 256l-67.896 35.215-87.406-25.045c-12.835-2.753-25.449 5.526-28.174 18.492-2.725 12.967 5.47 25.708 18.305 28.461l47.477 7.137-53.077 30.956C1.866 357.843-2.027 372.521 4.533 384s21.091 15.412 32.454 8.785l53.077-30.956-17.62 45.104a24.157 24.157 0 0 0 2.022 19.428c2.831 4.953 7.416 8.909 13.224 10.816 12.478 4.099 25.883-2.797 29.94-15.402l22.232-88.99 60.38-35.215V368l-65.175 63.945c-8.778 9.852-7.987 25.027 1.766 33.894 9.754 8.868 24.774 8.068 33.552-1.784l29.857-37.967V488c0 13.255 10.637 24 23.758 24s23.758-10.745 23.758-24v-61.912l29.857 37.967A23.59 23.59 0 0 0 295.282 472a23.534 23.534 0 0 0 15.885-6.161c9.753-8.867 10.544-24.042 1.766-33.894L247.758 368v-70.431l60.38 35.215 22.232 88.99c4.057 12.605 17.462 19.501 29.94 15.402 12.479-4.099 19.304-17.64 15.247-30.245l-17.621-45.104 53.077 30.956c11.363 6.627 25.893 2.694 32.454-8.785s2.667-26.157-8.696-32.785l-53.077-30.956 47.477-7.137c6.86-1.469 12.394-5.793 15.645-11.481z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/fas-solar-panel.svg b/svg/fontawesome/fas-solar-panel.svg
new file mode 100644
index 000000000..6c637615d
--- /dev/null
+++ b/svg/fontawesome/fas-solar-panel.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" data-prefix="fas" data-icon="solar-panel" class="svg-inline--fa fa-solar-panel fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M431.98 448.01l-47.97.05V416h-128v32.21l-47.98.05c-8.82.01-15.97 7.16-15.98 15.99l-.05 31.73c-.01 8.85 7.17 16.03 16.02 16.02l223.96-.26c8.82-.01 15.97-7.16 15.98-15.98l.04-31.73c.01-8.85-7.17-16.03-16.02-16.02zM585.2 26.74C582.58 11.31 568.99 0 553.06 0H86.93C71 0 57.41 11.31 54.79 26.74-3.32 369.16.04 348.08.03 352c-.03 17.32 14.29 32 32.6 32h574.74c18.23 0 32.51-14.56 32.59-31.79.02-4.08 3.35 16.95-54.76-325.47zM259.83 64h120.33l9.77 96H250.06l9.77-96zm-75.17 256H71.09L90.1 208h105.97l-11.41 112zm16.29-160H98.24l16.29-96h96.19l-9.77 96zm32.82 160l11.4-112h149.65l11.4 112H233.77zm195.5-256h96.19l16.29 96H439.04l-9.77-96zm26.06 256l-11.4-112H549.9l19.01 112H455.33z"></path></svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/category-utility.svg b/svg/iD-sprite/presets/category-utility.svg
new file mode 100644
index 000000000..e819114fc
--- /dev/null
+++ b/svg/iD-sprite/presets/category-utility.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
+  <svg y="7">
+    <path d="M20,10 L20,11 L22,11 L22,10 L20,10 z M24,10 L24,11 L26,11 L26,10 L24,10 z M34,10 L34,11 L36,11 L36,10 L34,10 z M38,10 L38,11 L40,11 L40,10 L38,10 z M20.312,15 C19.647,18.533 17.267,20.5 15,20.5 L14,20.5 L14,21.5 L15,21.5 C16.042,21.5 17.082,21.196 18,20.594 L18,21.5 L19,21.5 C21.879,21.5 24.615,19.022 25.312,15 L24.312,15 C23.647,18.533 21.267,20.5 19,20.5 L18.125,20.5 C19.686,19.42 20.885,17.509 21.312,15 L20.312,15 z M34.688,15 C35.385,19.022 38.121,21.5 41,21.5 L42,21.5 L42,20.594 C42.918,21.196 43.958,21.5 45,21.5 L46,21.5 L46,20.5 L45,20.5 C42.733,20.5 40.353,18.533 39.688,15 L38.688,15 C39.115,17.509 40.314,19.42 41.875,20.5 L41,20.5 C38.733,20.5 36.353,18.533 35.688,15 L34.688,15 z" fill="#989898"/>
+    <path d="M28,10 L28,12 L19,12 L19,14 L28,14 L28,36 L32,36 L32,14 L41,14 L41,12 L32,12 L32,10 L28,10 z" fill="#989898"/>
+  </svg>
+</svg>
diff --git a/test/spec/services/mapillary.js b/test/spec/services/mapillary.js
index 72046b1b6..eaadd6ba4 100644
--- a/test/spec/services/mapillary.js
+++ b/test/spec/services/mapillary.js
@@ -1,6 +1,6 @@
 describe('iD.serviceMapillary', function() {
-    var dimensions = [64, 64],
-        context, server, mapillary;
+    var dimensions = [64, 64];
+    var context, server, mapillary;
 
 
     before(function() {
@@ -59,13 +59,13 @@ describe('iD.serviceMapillary', function() {
             mapillary.on('loadedImages', spy);
             mapillary.loadImages(context.projection);
 
-            var match = /images/,
-                features = [{
-                    type: 'Feature',
-                    geometry: { type: 'Point', coordinates: [10,0] },
-                    properties: { ca: 90, key: '0' }
-                }],
-                response = { type: 'FeatureCollection', features: features };
+            var match = /images/;
+            var features = [{
+                type: 'Feature',
+                geometry: { type: 'Point', coordinates: [10,0] },
+                properties: { ca: 90, key: '0' }
+            }];
+            var response = { type: 'FeatureCollection', features: features };
 
             server.respondWith('GET', match,
                 [200, { 'Content-Type': 'application/json' }, JSON.stringify(response) ]);
@@ -80,13 +80,13 @@ describe('iD.serviceMapillary', function() {
             mapillary.on('loadedImages', spy);
             mapillary.loadImages(context.projection);
 
-            var match = /images/,
-                features = [{
-                    type: 'Feature',
-                    geometry: { type: 'Point', coordinates: [0,0] },
-                    properties: { ca: 90, key: '0' }
-                }],
-                response = { type: 'FeatureCollection', features: features };
+            var match = /images/;
+            var features = [{
+                type: 'Feature',
+                geometry: { type: 'Point', coordinates: [0,0] },
+                properties: { ca: 90, key: '0' }
+            }];
+            var response = { type: 'FeatureCollection', features: features };
 
             server.respondWith('GET', match,
                 [200, { 'Content-Type': 'application/json' }, JSON.stringify(response) ]);
@@ -100,9 +100,9 @@ describe('iD.serviceMapillary', function() {
             mapillary.on('loadedImages', spy);
             mapillary.loadImages(context.projection);
 
-            var features0 = [],
-                features1 = [],
-                i;
+            var features0 = [];
+            var features1 = [];
+            var i;
 
             for (i = 0; i < 1000; i++) {
                 features0.push({
@@ -119,10 +119,10 @@ describe('iD.serviceMapillary', function() {
                 });
             }
 
-            var match0 = /page=0/,
-                response0 = { type: 'FeatureCollection', features: features0 },
-                match1 = /page=1/,
-                response1 = { type: 'FeatureCollection', features: features1 };
+            var match0 = /page=0/;
+            var response0 = { type: 'FeatureCollection', features: features0 };
+            var match1 = /page=1/;
+            var response1 = { type: 'FeatureCollection', features: features1 };
 
             server.respondWith('GET', match0,
                 [200, { 'Content-Type': 'application/json' }, JSON.stringify(response0) ]);
@@ -140,17 +140,17 @@ describe('iD.serviceMapillary', function() {
             mapillary.on('loadedSigns', spy);
             mapillary.loadSigns(context, context.projection);
 
-            var match = /objects/,
-                detections = [{
-                    detection_key: '0',
-                    image_key: '0'
-                }],
-                features = [{
-                    type: 'Feature',
-                    geometry: { type: 'Point', coordinates: [10,0] },
-                    properties: { detections: detections, key: '0', value: 'not-in-set' }
-                }],
-                response = { type: 'FeatureCollection', features: features };
+            var match = /map_features/;
+            var detections = [{
+                detection_key: '0',
+                image_key: '0'
+            }];
+            var features = [{
+                type: 'Feature',
+                geometry: { type: 'Point', coordinates: [10,0] },
+                properties: { detections: detections, key: '0', value: 'not-in-set' }
+            }];
+            var response = { type: 'FeatureCollection', features: features };
 
             server.respondWith('GET', match,
                 [200, { 'Content-Type': 'application/json' }, JSON.stringify(response) ]);
@@ -165,17 +165,17 @@ describe('iD.serviceMapillary', function() {
             mapillary.on('loadedSigns', spy);
             mapillary.loadSigns(context, context.projection);
 
-            var match = /objects/,
-                detections = [{
-                    detection_key: '0',
-                    image_key: '0'
-                }],
-                features = [{
-                    type: 'Feature',
-                    geometry: { type: 'Point', coordinates: [0,0] },
-                    properties: { detections: detections, key: '0', value: 'not-in-set' }
-                }],
-                response = { type: 'FeatureCollection', features: features };
+            var match = /map_features/;
+            var detections = [{
+                detection_key: '0',
+                image_key: '0'
+            }];
+            var features = [{
+                type: 'Feature',
+                geometry: { type: 'Point', coordinates: [0,0] },
+                properties: { detections: detections, key: '0', value: 'not-in-set' }
+            }];
+            var response = { type: 'FeatureCollection', features: features };
 
             server.respondWith('GET', match,
                 [200, { 'Content-Type': 'application/json' }, JSON.stringify(response) ]);
@@ -190,15 +190,15 @@ describe('iD.serviceMapillary', function() {
             mapillary.loadSigns(context, context.projection);
 
             var rects = [{
-                    package: 'trafficsign',
-                    rect: [ 0.805, 0.463, 0.833, 0.502 ],
-                    length: 4,
-                    score: '1.27',
-                    type: 'regulatory--maximum-speed-limit-65--us'
-                }],
-                features0 = [],
-                features1 = [],
-                i;
+                package: 'trafficsign',
+                rect: [ 0.805, 0.463, 0.833, 0.502 ],
+                length: 4,
+                score: '1.27',
+                type: 'regulatory--maximum-speed-limit-65--us'
+            }];
+            var features0 = [];
+            var features1 = [];
+            var i;
 
             for (i = 0; i < 1000; i++) {
                 features0.push({
@@ -215,10 +215,10 @@ describe('iD.serviceMapillary', function() {
                 });
             }
 
-            var match0 = /page=0/,
-                response0 = { type: 'FeatureCollection', features: features0 },
-                match1 = /page=1/,
-                response1 = { type: 'FeatureCollection', features: features1 };
+            var match0 = /page=0/;
+            var response0 = { type: 'FeatureCollection', features: features0 };
+            var match1 = /page=1/;
+            var response1 = { type: 'FeatureCollection', features: features1 };
 
             server.respondWith('GET', match0,
                 [200, { 'Content-Type': 'application/json' }, JSON.stringify(response0) ]);
@@ -266,14 +266,14 @@ describe('iD.serviceMapillary', function() {
     describe('#signs', function() {
         it('returns signs in the visible map area', function() {
             var detections = [{
-                    detection_key: '78vqha63gs1upg15s823qckcmn',
-                    image_key: 'bwYs-uXLDvm_meo_EC5Nzw'
-                }],
-                features = [
-                    { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '0', loc: [10,0], detections: detections } },
-                    { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '1', loc: [10,0], detections: detections } },
-                    { minX: 10, minY: 1, maxX: 10, maxY: 1, data: { key: '2', loc: [10,1], detections: detections } }
-                ];
+                detection_key: '78vqha63gs1upg15s823qckcmn',
+                image_key: 'bwYs-uXLDvm_meo_EC5Nzw'
+            }];
+            var features = [
+                { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '0', loc: [10,0], detections: detections } },
+                { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '1', loc: [10,0], detections: detections } },
+                { minX: 10, minY: 1, maxX: 10, maxY: 1, data: { key: '2', loc: [10,1], detections: detections } }
+            ];
 
             mapillary.cache().objects.rtree.load(features);
             var res = mapillary.signs(context.projection);
@@ -286,16 +286,16 @@ describe('iD.serviceMapillary', function() {
 
         it('limits results no more than 3 stacked signs in one spot', function() {
             var detections = [{
-                    detection_key: '78vqha63gs1upg15s823qckcmn',
-                    image_key: 'bwYs-uXLDvm_meo_EC5Nzw'
-                }],
-                features = [
-                    { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '0', loc: [10,0], detections: detections } },
-                    { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '1', loc: [10,0], detections: detections } },
-                    { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '2', loc: [10,0], detections: detections } },
-                    { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '3', loc: [10,0], detections: detections } },
-                    { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '4', loc: [10,0], detections: detections } }
-                ];
+                detection_key: '78vqha63gs1upg15s823qckcmn',
+                image_key: 'bwYs-uXLDvm_meo_EC5Nzw'
+            }];
+            var features = [
+                { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '0', loc: [10,0], detections: detections } },
+                { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '1', loc: [10,0], detections: detections } },
+                { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '2', loc: [10,0], detections: detections } },
+                { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '3', loc: [10,0], detections: detections } },
+                { minX: 10, minY: 0, maxX: 10, maxY: 0, data: { key: '4', loc: [10,0], detections: detections } }
+            ];
 
             mapillary.cache().objects.rtree.load(features);
             var res = mapillary.signs(context.projection);
diff --git a/test/spec/services/osm.js b/test/spec/services/osm.js
index b8080b2c5..c977cf599 100644
--- a/test/spec/services/osm.js
+++ b/test/spec/services/osm.js
@@ -140,7 +140,7 @@ describe('iD.serviceOsm', function () {
         var path = '/api/0.6/map?bbox=-74.542,40.655,-74.541,40.656';
         var response = '<?xml version="1.0" encoding="UTF-8"?>' +
                 '<osm version="0.6">' +
-                '  <bounds minlat="40.655" minlon="-74.542" maxlat="40.656" maxlon="-74.541' +
+                '  <bounds minlat="40.655" minlon="-74.542" maxlat="40.656" maxlon="-74.541"/>' +
                 '  <node id="105340439" visible="true" version="2" changeset="2880013" timestamp="2009-10-18T07:47:39Z" user="woodpeck_fixbot" uid="147510" lat="40.6555" lon="-74.5415"/>' +
                 '  <node id="105340442" visible="true" version="2" changeset="2880013" timestamp="2009-10-18T07:47:39Z" user="woodpeck_fixbot" uid="147510" lat="40.6556" lon="-74.5416"/>' +
                 '  <way id="40376199" visible="true" version="1" changeset="2403012" timestamp="2009-09-07T16:01:13Z" user="NJDataUploads" uid="148169">' +