diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31a96c02c..daca5379a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ or learn more by visiting our project page on GitHub:  :octocat: https://github.
 _Breaking changes, which may affect downstream projects or sites that embed iD, are marked with a_ :warning:
 
 <!--
-  # A.B.C
+# A.B.C
 ##### MMM DD, YYYY
 
 #### :newspaper: News
@@ -26,6 +26,62 @@ _Breaking changes, which may affect downstream projects or sites that embed iD,
 [@xxxx]: https://github.com/xxxx
 -->
 
+# 2.3.2
+##### July 24, 2017
+
+#### :tada: New Features
+
+* Display capture date on the attribution line at bottom of Mapillary viewer ([#4156])
+* Highlight detected objects and signs in Mapillary images ([#3772], [#4148], thanks [@kepta])
+
+[#4156]: https://github.com/openstreetmap/iD/issues/4156
+[#4148]: https://github.com/openstreetmap/iD/issues/4148
+[#3772]: https://github.com/openstreetmap/iD/issues/3772
+[@kepta]: https://github.com/kepta
+
+#### :sparkles: Usability
+
+* Prevent user from tabbing from fields in the sidebar to the browser's address bar ([#4159])
+* Distinguish between default vs. tagged `service=*` highways and railways ([#4157])
+* Fix styles for several aeroway, highway, railway mapped as areas ([#4167])
+* Change rendering for non-grass sport pitches (basketball, skateboard, beachvolleyball)
+* Render `railway=platform` like sidewalks and footpaths
+* Place pasted point at cursor (not offset) when pasting while dragging the map ([#4155])
+
+[#4167]: https://github.com/openstreetmap/iD/issues/4167
+[#4159]: https://github.com/openstreetmap/iD/issues/4159
+[#4157]: https://github.com/openstreetmap/iD/issues/4157
+[#4155]: https://github.com/openstreetmap/iD/issues/4155
+
+#### :bug: Bugfixes
+
+* Make expandable sidebar sections work with incognito mode ([#4159])
+* Remember the chosen custom background when set by url ([#4162], [#4165], thanks [@pgiraud])
+* Fix: <kbd>⌘⇧B</kbd> / <kbd>Ctrl+Shift+B</kbd> should not also swap the background like <kbd>⌘B</kbd> / <kbd>Ctrl+B</kbd> ([#4153])
+
+[#4165]: https://github.com/openstreetmap/iD/issues/4165
+[#4162]: https://github.com/openstreetmap/iD/issues/4162
+[#4159]: https://github.com/openstreetmap/iD/issues/4159
+[#4153]: https://github.com/openstreetmap/iD/issues/4153
+[@pgiraud]: https://github.com/pgiraud
+
+#### :rocket: Presets
+
+* Add presets, icons for Wind and Nuclear `power=generator`, and `output:electricity` field
+* Add presets, icons for Shinto, Taoist, Hindu, Sikh `amenity=place_of_worship` ([#4175])
+* Add preset for Dog Excrement Bin, `waste=dog_excrement` ([#4172], thanks [@JamesKingdom])
+* Add Clothes field to Clothing Store, Botique, Fashion ([#4149])
+* Change caption for content field from "Contents" to "Content" ([#4169])
+* Add presets for Windmill and Watermill ([#4168])
+
+[#4175]: https://github.com/openstreetmap/iD/issues/4175
+[#4172]: https://github.com/openstreetmap/iD/issues/4172
+[#4169]: https://github.com/openstreetmap/iD/issues/4169
+[#4168]: https://github.com/openstreetmap/iD/issues/4168
+[#4149]: https://github.com/openstreetmap/iD/issues/4149
+[@JamesKingdom]: https://github.com/JamesKingdom
+
+
 # 2.3.1
 ##### July 11, 2017
 
diff --git a/css/40_railways.css b/css/40_railways.css
index 2e3575669..b43311555 100644
--- a/css/40_railways.css
+++ b/css/40_railways.css
@@ -86,11 +86,15 @@ path.stroke.tag-railway-subway {
 
 /* railway platforms - like sidewalks */
 
+.preset-icon .icon.highway-footway.tag-railway-platform {
+    color: #ae8681;
+    fill: #dcd9b9;
+}
 path.shadow.tag-railway-platform {
     stroke-width: 16;
 }
 path.casing.tag-railway-platform {
-    stroke: #fff;
+    stroke: #dcd9b9;
     stroke-width: 5;
     stroke-linecap: round;
     stroke-dasharray: none;
diff --git a/css/80_app.css b/css/80_app.css
index 7de353237..ac382dc1b 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -865,6 +865,7 @@ button.save.has-count .count::before {
     border: 1.5px solid #333;
     border-radius: 20px;
     background-color: #efefef;
+    backface-visibility: hidden;
 }
 
 [dir='rtl'] .preset-icon-fill-vertex,
@@ -967,7 +968,7 @@ button.save.has-count .count::before {
     position: absolute;
     top: 0;
     right: 0;
-    width: 10%;
+    width: 32px;
     background: #fafafa;
 }
 
@@ -1023,21 +1024,25 @@ button.save.has-count .count::before {
 
 /* preset form basics */
 
-.inspector-preset {
+.preset-editor {
     overflow: hidden;
     padding-bottom: 10px;
 }
 
-.inspector-preset a.hide-toggle {
+.preset-editor a.hide-toggle {
     margin: 0 20px 10px 20px;
 }
 
-.inspector-preset .preset-form {
+.preset-editor .preset-form {
     padding: 10px;
     margin: 0 10px 10px 10px;
     border-radius: 8px;
 }
 
+.preset-editor .preset-form:empty {
+    display: none;
+}
+
 .entity-editor-pane .preset-list-item .preset-list-button-wrap {
     margin-bottom: 0;
 }
@@ -1051,7 +1056,8 @@ button.save.has-count .count::before {
             transition: margin-bottom 200ms;
 }
 
-.form-field:last-child {
+.form-field.nowrap,
+.wrap-form-field:last-child .form-field {
     margin-bottom: 0;
 }
 
@@ -1092,7 +1098,7 @@ button.save.has-count .count::before {
 
 .form-label button {
     border-left: 1px solid #ccc;
-    width: 10%;
+    width: 32px;
     height: 100%;
     border-radius: 0;
     background: #f6f6f6;
@@ -1101,6 +1107,7 @@ button.save.has-count .count::before {
     border-left: none;
     border-right: 1px solid #CCC;
     border-radius: 4px 0 0 0;
+    width: 31px;
 }
 .form-label button:hover {
     background: #f1f1f1;
@@ -1141,6 +1148,7 @@ button.save.has-count .count::before {
 .inspector-hover .form-field-multicombo,
 .inspector-hover .structure-extras-wrap,
 .inspector-hover input,
+.inspector-hover textarea,
 .inspector-hover label {
     background: #ececec;
 }
@@ -1291,6 +1299,7 @@ button.save.has-count .count::before {
 
 /* preset form access */
 /* preset form cycleway */
+/* preset form structure extras */
 
 .form-field-structure .structure-extras-wrap li,
 .form-field-cycleway .preset-input-wrap li,
@@ -1330,6 +1339,34 @@ button.save.has-count .count::before {
     border: 1px solid #ccc;
     border-radius: 4px;
 }
+.structure-extras-wrap li:first-child span {
+    border-top-left-radius: 4px;
+}
+.structure-extras-wrap li:first-child input {
+    border-top-right-radius: 4px;
+}
+.structure-extras-wrap li:last-child span {
+    border-bottom-left-radius: 4px;
+}
+.structure-extras-wrap li:last-child input {
+    border-bottom-right-radius: 4px;
+}
+[dir='rtl'] .structure-extras-wrap li:first-child span {
+    border-top-left-radius: 0;
+    border-top-right-radius: 4px;
+}
+[dir='rtl'] .structure-extras-wrap li:first-child input {
+    border-top-right-radius: 0;
+    border-top-left-radius: 4px;
+}
+[dir='rtl'] .structure-extras-wrap li:last-child span {
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 4px;
+}
+[dir='rtl'] .structure-extras-wrap li:last-child input {
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 4px;
+}
 
 
 /* preset form multicombo */
@@ -1398,28 +1435,43 @@ input[type=number] {
 }
 
 .spin-control {
-    width: 20%;
-    height: 29px;
+    width: 64px;
+    height: 30px;
     display: inline-block;
-    margin-left: -20%;
+    margin-left: -64px;
     margin-bottom: -11px;
     position: relative;
 }
+[dir='rtl'] .spin-control{
+    margin-left: 0;
+    margin-right: -64px;
+}
 
 .spin-control button {
     right: 1px;
     position: relative;
     float: left;
     height: 100%;
-    width: 50%;
+    width: 32px;
     border-left: 1px solid #CCC;
     border-radius: 0;
     background: rgba(0, 0, 0, 0);
 }
+[dir='rtl'] .spin-control button{
+    border-left: 0;
+    border-right: 1px solid #CCC;
+}
 
 .spin-control button.decrement {
     border-bottom-right-radius: 3px;
 }
+[dir='rtl'] .spin-control button.decrement {
+    border-bottom-right-radius: 0;
+}
+[dir='rtl'] .spin-control button.increment {
+    border-bottom-left-radius: 3px;
+    right: 0;
+}
 
 .spin-control button.decrement::after,
 .spin-control button.increment::after {
@@ -1442,6 +1494,7 @@ input[type=number] {
     border-right: 5px solid transparent;
 }
 
+
 /* preset form checkbox */
 
 .checkselect label:last-of-type {
@@ -1525,11 +1578,11 @@ input[type=number] {
 }
 
 .form-field .wiki-title ~ .combobox-caret {
-    right: 10%;
+    right: 32px;
 }
 [dir='rtl'] .form-field .wiki-title ~ .combobox-caret {
     right: auto;
-    left: 10%;
+    left: 32px;
 }
 
 /* Localized field */
@@ -1544,8 +1597,8 @@ input[type=number] {
 .form-field .button-input-action {
     position: relative;
     right: 1px;
-    width: 10%;
-    margin-left: -10%;
+    width: 32px;
+    margin-left: -32px;
     border: 1px solid #CCC;
     border-top-width: 0;
     border-right-width: 0;
@@ -1555,7 +1608,7 @@ input[type=number] {
 }
 [dir='rtl'] .form-field .button-input-action {
     margin-left: 0;
-    margin-right: -10%;
+    margin-right: -32px;
     border-right-width: 1px;
     border-radius: 0 0 0 4px;
 }
@@ -1966,6 +2019,14 @@ img.wiki-image {
     background: rgba(0,0,0,.8);
 }
 
+/* hidden field to prevent user from tabbing out of the sidebar */
+input.key-trap {
+    height: 0px;
+    width: 0px;
+    padding: 0px;
+    border: 1px solid rgba(0,0,0,0);
+}
+
 /* Fullscreen button */
 div.full-screen {
     float: right;
@@ -2695,6 +2756,9 @@ img.tile-removing {
     background: none;
     color: #ddd;
 }
+[dir='rtl'] .panel-title button.close {
+    float: left;
+}
 
 .panel-title button.close:hover {
     color: #fff;
@@ -4156,23 +4220,6 @@ li.hide + li.version .badge .tooltip .tooltip-arrow {
   border-radius: 4px 0 0 4px;
 }
 
-
-/* increment / decrement control - code by Naoufel Razouane */
-
-[dir='rtl'] .spin-control{
-  margin-left: 0;
-  margin-right: -20%;
-}
-[dir='rtl'] .spin-control button{
-  border-left: 0;
-  border-right: 1px solid #CCC;
-}
-[dir='rtl'] .spin-control button.decrement{
-  border-bottom-right-radius: 0;
-}
-[dir='rtl'] .spin-control button.increment{
-  border-bottom-left-radius: 3px;
-}
 /* modal */
 [dir='rtl'] .modal > button {
     position: absolute;
diff --git a/data/locales.json b/data/locales.json
index cd8710805..dcb6ce79e 100644
--- a/data/locales.json
+++ b/data/locales.json
@@ -36,6 +36,9 @@
         "de": {
             "rtl": false
         },
+        "dv": {
+            "rtl": false
+        },
         "el": {
             "rtl": false
         },
diff --git a/data/presets.yaml b/data/presets.yaml
index f2a2861fc..5895a11b2 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -246,6 +246,11 @@ en:
       brand:
         # brand=*
         label: Brand
+      bridge:
+        # bridge=*
+        label: Type
+        # bridge field placeholder
+        placeholder: Default
       building:
         # building=*
         label: Building
@@ -369,6 +374,11 @@ en:
       currency_multi:
         # 'currency:=*'
         label: Currency Types
+      cutting:
+        # cutting=*
+        label: Type
+        # cutting field placeholder
+        placeholder: Default
       cycle_network:
         # cycle_network=*
         label: Network
@@ -458,6 +468,11 @@ en:
         label: Email
         # email field placeholder
         placeholder: example@example.com
+      embankment:
+        # embankment=*
+        label: Type
+        # embankment field placeholder
+        placeholder: Default
       emergency:
         # emergency=*
         label: Emergency
@@ -505,6 +520,11 @@ en:
       fixme:
         # fixme=*
         label: Fix Me
+      ford:
+        # ford=*
+        label: Type
+        # ford field placeholder
+        placeholder: Default
       fuel:
         # fuel=*
         label: Fuel
@@ -540,11 +560,6 @@ en:
       generator/type:
         # 'generator:type=*'
         label: Type
-      golf_hole:
-        # ref=*
-        label: Reference
-        # golf_hole field placeholder
-        placeholder: Hole number (1-18)
       grape_variety:
         # grape_variety=*
         label: Grape Varieties
@@ -639,6 +654,8 @@ en:
       layer:
         # layer=*
         label: Layer
+        # layer field placeholder
+        placeholder: '0'
       leaf_cycle:
         # leaf_cycle=*
         label: Leaf Cycle
@@ -735,6 +752,11 @@ en:
       maxweight:
         # maxweight=*
         label: Max Weight
+      milestone_position:
+        # 'railway:position=*'
+        label: Milestone Position
+        # milestone_position field placeholder
+        placeholder: Distance to one decimal (123.4)
       mtb/scale:
         # 'mtb:scale=*'
         label: Mountain Biking Difficulty
@@ -1022,7 +1044,40 @@ en:
           container: Container
       ref:
         # ref=*
-        label: Reference
+        label: Reference Code
+      ref_aeroway_gate:
+        # ref=*
+        label: Gate Number
+      ref_golf_hole:
+        # ref=*
+        label: Hole Number
+        # ref_golf_hole field placeholder
+        placeholder: 1-18
+      ref_highway_junction:
+        # ref=*
+        label: Junction Number
+      ref_platform:
+        # ref=*
+        label: Platform Number
+      ref_road_number:
+        # ref=*
+        label: Road Number
+      ref_route:
+        # ref=*
+        label: Route Number
+      ref_runway:
+        # ref=*
+        label: Runway Number
+        # ref_runway field placeholder
+        placeholder: e.g. 01L/19R
+      ref_stop_position:
+        # ref=*
+        label: Stop Number
+      ref_taxiway:
+        # ref=*
+        label: Taxiway Name
+        # ref_taxiway field placeholder
+        placeholder: e.g. A5
       relation:
         # type=*
         label: Type
@@ -1328,6 +1383,11 @@ en:
         # trees=*
         label: Trees
       tunnel:
+        # tunnel=*
+        label: Type
+        # tunnel field placeholder
+        placeholder: Default
+      tunnel_waterway:
         # tunnel=*
         label: Tunnel
       vending:
@@ -1434,6 +1494,7 @@ en:
       aerialway/t-bar:
         # aerialway=t-bar
         name: T-bar Lift
+        # 'terms: tbar'
         terms: '<translate with synonyms or related terms for ''T-bar Lift'', separated by commas>'
       aeroway:
         # aeroway=*
@@ -1897,7 +1958,7 @@ en:
       amenity/social_facility/group_home:
         # 'amenity=social_facility, social_facility=group_home, social_facility:for=senior'
         name: Elderly Group Home
-        # 'terms: old,senior,living'
+        # 'terms: old,senior,living,care home,assisted living'
         terms: '<translate with synonyms or related terms for ''Elderly Group Home'', separated by commas>'
       amenity/social_facility/homeless_shelter:
         # 'amenity=social_facility, social_facility=shelter, social_facility:for=homeless'
@@ -1907,7 +1968,7 @@ en:
       amenity/social_facility/nursing_home:
         # 'amenity=social_facility, social_facility=nursing_home, social_facility:for=senior'
         name: Nursing Home
-        # 'terms: elderly,living,nursing,old,senior'
+        # 'terms: elderly,living,nursing,old,senior,assisted living'
         terms: '<translate with synonyms or related terms for ''Nursing Home'', separated by commas>'
       amenity/studio:
         # amenity=studio
@@ -3292,7 +3353,7 @@ en:
       man_made/pier:
         # man_made=pier
         name: Pier
-        # 'terms: dock'
+        # 'terms: dock,jetty'
         terms: '<translate with synonyms or related terms for ''Pier'', separated by commas>'
       man_made/pipeline:
         # man_made=pipeline
@@ -3372,6 +3433,11 @@ en:
         name: Storm Drain
         # 'terms: cover,drain,hole,rain,sewer,sewage,storm'
         terms: '<translate with synonyms or related terms for ''Storm Drain'', separated by commas>'
+      manhole/telecom:
+        # manhole=telecom
+        name: Telecom Manhole
+        # 'terms: cover,phone,hole,telecom,telephone,bt'
+        terms: '<translate with synonyms or related terms for ''Telecom Manhole'', separated by commas>'
       natural:
         # natural=*
         name: Natural
@@ -3727,11 +3793,21 @@ en:
         # railway=abandoned
         name: Abandoned Railway
         terms: '<translate with synonyms or related terms for ''Abandoned Railway'', separated by commas>'
+      railway/buffer_stop:
+        # railway=buffer_stop
+        name: Buffer Stop
+        # 'terms: stop,halt,buffer'
+        terms: '<translate with synonyms or related terms for ''Buffer Stop'', separated by commas>'
       railway/crossing:
         # railway=crossing
         name: Railway Crossing (Path)
         # 'terms: crossing,pedestrian crossing,railroad crossing,level crossing,grade crossing,path through railroad,train crossing'
         terms: '<translate with synonyms or related terms for ''Railway Crossing (Path)'', separated by commas>'
+      railway/derail:
+        # railway=derail
+        name: Railway Derailer
+        # 'terms: derailer'
+        terms: '<translate with synonyms or related terms for ''Railway Derailer'', separated by commas>'
       railway/disused:
         # railway=disused
         name: Disused Railway
@@ -3751,6 +3827,11 @@ en:
         name: Railway Crossing (Road)
         # 'terms: crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing'
         terms: '<translate with synonyms or related terms for ''Railway Crossing (Road)'', separated by commas>'
+      railway/milestone:
+        # railway=milestone
+        name: Railway Milestone
+        # 'terms: milestone,marker'
+        terms: '<translate with synonyms or related terms for ''Railway Milestone'', separated by commas>'
       railway/monorail:
         # railway=monorail
         name: Monorail
@@ -3768,6 +3849,11 @@ en:
         # railway=rail
         name: Rail
         terms: '<translate with synonyms or related terms for ''Rail'', separated by commas>'
+      railway/signal:
+        # railway=signal
+        name: Railway Signal
+        # 'terms: signal,lights'
+        terms: '<translate with synonyms or related terms for ''Railway Signal'', separated by commas>'
       railway/station:
         # railway=station
         name: Railway Station
@@ -3783,6 +3869,16 @@ en:
         name: Subway Entrance
         # 'terms: metro,transit'
         terms: '<translate with synonyms or related terms for ''Subway Entrance'', separated by commas>'
+      railway/switch:
+        # railway=switch
+        name: Railway Switch
+        # 'terms: switch,points'
+        terms: '<translate with synonyms or related terms for ''Railway Switch'', separated by commas>'
+      railway/train_wash:
+        # railway=wash
+        name: Train Wash
+        # 'terms: wash,clean'
+        terms: '<translate with synonyms or related terms for ''Train Wash'', separated by commas>'
       railway/tram:
         # railway=tram
         name: Tram
diff --git a/data/presets/categories.json b/data/presets/categories.json
index ca39df4d3..310781588 100644
--- a/data/presets/categories.json
+++ b/data/presets/categories.json
@@ -9,6 +9,7 @@
                 "barrier/wall",
                 "barrier/ditch",
                 "barrier/gate",
+                "barrier/hedge",
                 "barrier"
             ]
         },
diff --git a/data/presets/categories/barrier.json b/data/presets/categories/barrier.json
index 087267ec0..a9b681b52 100644
--- a/data/presets/categories/barrier.json
+++ b/data/presets/categories/barrier.json
@@ -7,6 +7,7 @@
         "barrier/wall",
         "barrier/ditch",
         "barrier/gate",
+        "barrier/hedge",
         "barrier"
     ]
 }
diff --git a/data/presets/fields.json b/data/presets/fields.json
index c0bb8450d..e099f5416 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -329,6 +329,12 @@
             "type": "text",
             "label": "Brand"
         },
+        "bridge": {
+            "key": "bridge",
+            "type": "typeCombo",
+            "label": "Type",
+            "placeholder": "Default"
+        },
         "building_area": {
             "key": "building",
             "type": "combo",
@@ -488,6 +494,12 @@
             "type": "multiCombo",
             "label": "Currency Types"
         },
+        "cutting": {
+            "key": "cutting",
+            "type": "typeCombo",
+            "label": "Type",
+            "placeholder": "Default"
+        },
         "cycle_network": {
             "key": "cycle_network",
             "type": "networkCombo",
@@ -631,6 +643,12 @@
             "universal": true,
             "label": "Email"
         },
+        "embankment": {
+            "key": "embankment",
+            "type": "typeCombo",
+            "label": "Type",
+            "placeholder": "Default"
+        },
         "emergency": {
             "key": "emergency",
             "type": "check",
@@ -695,6 +713,12 @@
             "label": "Fix Me",
             "universal": true
         },
+        "ford": {
+            "key": "ford",
+            "type": "typeCombo",
+            "label": "Type",
+            "placeholder": "Default"
+        },
         "fuel_multi": {
             "key": "fuel:",
             "type": "multiCombo",
@@ -748,12 +772,6 @@
             "type": "combo",
             "label": "Type"
         },
-        "golf_hole": {
-            "key": "ref",
-            "type": "text",
-            "label": "Reference",
-            "placeholder": "Hole number (1-18)"
-        },
         "grape_variety": {
             "key": "grape_variety",
             "type": "semiCombo",
@@ -889,8 +907,9 @@
         },
         "layer": {
             "key": "layer",
-            "type": "combo",
-            "label": "Layer"
+            "type": "number",
+            "label": "Layer",
+            "placeholder": "0"
         },
         "leaf_cycle_singular": {
             "key": "leaf_cycle",
@@ -1034,6 +1053,12 @@
             "label": "Max Weight",
             "snake_case": false
         },
+        "milestone_position": {
+            "key": "railway:position",
+            "type": "text",
+            "placeholder": "Distance to one decimal (123.4)",
+            "label": "Milestone Position"
+        },
         "mtb/scale": {
             "key": "mtb:scale",
             "type": "combo",
@@ -1086,6 +1111,7 @@
             "key": "name",
             "type": "localized",
             "label": "Name",
+            "universal": true,
             "placeholder": "Common name (if any)"
         },
         "natural": {
@@ -1361,10 +1387,58 @@
                 }
             }
         },
+        "ref_aeroway_gate": {
+            "key": "ref",
+            "type": "text",
+            "label": "Gate Number"
+        },
+        "ref_golf_hole": {
+            "key": "ref",
+            "type": "text",
+            "label": "Hole Number",
+            "placeholder": "1-18"
+        },
+        "ref_highway_junction": {
+            "key": "ref",
+            "type": "text",
+            "label": "Junction Number"
+        },
+        "ref_platform": {
+            "key": "ref",
+            "type": "text",
+            "label": "Platform Number"
+        },
+        "ref_road_number": {
+            "key": "ref",
+            "type": "text",
+            "label": "Road Number"
+        },
+        "ref_route": {
+            "key": "ref",
+            "type": "text",
+            "label": "Route Number"
+        },
+        "ref_runway": {
+            "key": "ref",
+            "type": "text",
+            "label": "Runway Number",
+            "placeholder": "e.g. 01L/19R"
+        },
+        "ref_stop_position": {
+            "key": "ref",
+            "type": "text",
+            "label": "Stop Number"
+        },
+        "ref_taxiway": {
+            "key": "ref",
+            "type": "text",
+            "label": "Taxiway Name",
+            "placeholder": "e.g. A5"
+        },
         "ref": {
             "key": "ref",
             "type": "text",
-            "label": "Reference"
+            "label": "Reference Code"
         },
         "relation": {
             "key": "type",
@@ -1793,11 +1867,17 @@
             "type": "semiCombo",
             "label": "Trees"
         },
-        "tunnel": {
+        "tunnel_waterway": {
             "key": "tunnel",
             "type": "combo",
             "label": "Tunnel"
         },
+        "tunnel": {
+            "key": "tunnel",
+            "type": "typeCombo",
+            "label": "Type",
+            "placeholder": "Default"
+        },
         "vending": {
             "key": "vending",
             "type": "combo",
diff --git a/data/presets/fields/bridge.json b/data/presets/fields/bridge.json
new file mode 100644
index 000000000..bf0e98a04
--- /dev/null
+++ b/data/presets/fields/bridge.json
@@ -0,0 +1,6 @@
+{
+    "key": "bridge",
+    "type": "typeCombo",
+    "label": "Type",
+    "placeholder": "Default"
+}
diff --git a/data/presets/fields/cutting.json b/data/presets/fields/cutting.json
new file mode 100644
index 000000000..72314c8ff
--- /dev/null
+++ b/data/presets/fields/cutting.json
@@ -0,0 +1,6 @@
+{
+    "key": "cutting",
+    "type": "typeCombo",
+    "label": "Type",
+    "placeholder": "Default"
+}
diff --git a/data/presets/fields/embankment.json b/data/presets/fields/embankment.json
new file mode 100644
index 000000000..a9818c5ba
--- /dev/null
+++ b/data/presets/fields/embankment.json
@@ -0,0 +1,6 @@
+{
+    "key": "embankment",
+    "type": "typeCombo",
+    "label": "Type",
+    "placeholder": "Default"
+}
diff --git a/data/presets/fields/ford.json b/data/presets/fields/ford.json
new file mode 100644
index 000000000..3755f5925
--- /dev/null
+++ b/data/presets/fields/ford.json
@@ -0,0 +1,6 @@
+{
+    "key": "ford",
+    "type": "typeCombo",
+    "label": "Type",
+    "placeholder": "Default"
+}
diff --git a/data/presets/fields/golf_hole.json b/data/presets/fields/golf_hole.json
deleted file mode 100644
index ec43fd845..000000000
--- a/data/presets/fields/golf_hole.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "key": "ref",
-    "type": "text",
-    "label": "Reference",
-    "placeholder": "Hole number (1-18)"
-}
\ No newline at end of file
diff --git a/data/presets/fields/layer.json b/data/presets/fields/layer.json
index d66d60c0a..29039f46a 100644
--- a/data/presets/fields/layer.json
+++ b/data/presets/fields/layer.json
@@ -1,5 +1,6 @@
 {
     "key": "layer",
-    "type": "combo",
-    "label": "Layer"
-}
\ No newline at end of file
+    "type": "number",
+    "label": "Layer",
+    "placeholder": "0"
+}
diff --git a/data/presets/fields/milestone_position.json b/data/presets/fields/milestone_position.json
new file mode 100644
index 000000000..657346515
--- /dev/null
+++ b/data/presets/fields/milestone_position.json
@@ -0,0 +1,6 @@
+{
+    "key": "railway:position",
+    "type": "text",
+    "placeholder": "Distance to one decimal (123.4)",
+    "label": "Milestone Position"
+}
diff --git a/data/presets/fields/name.json b/data/presets/fields/name.json
index 361701ce1..8ee1bd101 100644
--- a/data/presets/fields/name.json
+++ b/data/presets/fields/name.json
@@ -2,5 +2,6 @@
     "key": "name",
     "type": "localized",
     "label": "Name",
+    "universal": true,
     "placeholder": "Common name (if any)"
 }
diff --git a/data/presets/fields/ref.json b/data/presets/fields/ref.json
index f84d90025..2ef67a6ea 100644
--- a/data/presets/fields/ref.json
+++ b/data/presets/fields/ref.json
@@ -1,5 +1,5 @@
 {
     "key": "ref",
     "type": "text",
-    "label": "Reference"
-}
\ No newline at end of file
+    "label": "Reference Code"
+}
diff --git a/data/presets/fields/ref_aeroway_gate.json b/data/presets/fields/ref_aeroway_gate.json
new file mode 100644
index 000000000..8e05a7630
--- /dev/null
+++ b/data/presets/fields/ref_aeroway_gate.json
@@ -0,0 +1,5 @@
+{
+    "key": "ref",
+    "type": "text",
+    "label": "Gate Number"
+}
diff --git a/data/presets/fields/ref_golf_hole.json b/data/presets/fields/ref_golf_hole.json
new file mode 100644
index 000000000..05e57549a
--- /dev/null
+++ b/data/presets/fields/ref_golf_hole.json
@@ -0,0 +1,6 @@
+{
+    "key": "ref",
+    "type": "text",
+    "label": "Hole Number",
+    "placeholder": "1-18"
+}
diff --git a/data/presets/fields/ref_highway_junction.json b/data/presets/fields/ref_highway_junction.json
new file mode 100644
index 000000000..581689c73
--- /dev/null
+++ b/data/presets/fields/ref_highway_junction.json
@@ -0,0 +1,5 @@
+{
+    "key": "ref",
+    "type": "text",
+    "label": "Junction Number"
+}
diff --git a/data/presets/fields/ref_platform.json b/data/presets/fields/ref_platform.json
new file mode 100644
index 000000000..036f4001c
--- /dev/null
+++ b/data/presets/fields/ref_platform.json
@@ -0,0 +1,5 @@
+{
+    "key": "ref",
+    "type": "text",
+    "label": "Platform Number"
+}
diff --git a/data/presets/fields/ref_road_number.json b/data/presets/fields/ref_road_number.json
new file mode 100644
index 000000000..d23497c4a
--- /dev/null
+++ b/data/presets/fields/ref_road_number.json
@@ -0,0 +1,5 @@
+{
+    "key": "ref",
+    "type": "text",
+    "label": "Road Number"
+}
diff --git a/data/presets/fields/ref_route.json b/data/presets/fields/ref_route.json
new file mode 100644
index 000000000..9efc25bb3
--- /dev/null
+++ b/data/presets/fields/ref_route.json
@@ -0,0 +1,5 @@
+{
+    "key": "ref",
+    "type": "text",
+    "label": "Route Number"
+}
diff --git a/data/presets/fields/ref_runway.json b/data/presets/fields/ref_runway.json
new file mode 100644
index 000000000..02440ded9
--- /dev/null
+++ b/data/presets/fields/ref_runway.json
@@ -0,0 +1,6 @@
+{
+    "key": "ref",
+    "type": "text",
+    "label": "Runway Number",
+    "placeholder": "e.g. 01L/19R"
+}
diff --git a/data/presets/fields/ref_stop_position.json b/data/presets/fields/ref_stop_position.json
new file mode 100644
index 000000000..ddcebfa5a
--- /dev/null
+++ b/data/presets/fields/ref_stop_position.json
@@ -0,0 +1,5 @@
+{
+    "key": "ref",
+    "type": "text",
+    "label": "Stop Number"
+}
diff --git a/data/presets/fields/ref_taxiway.json b/data/presets/fields/ref_taxiway.json
new file mode 100644
index 000000000..178ad944d
--- /dev/null
+++ b/data/presets/fields/ref_taxiway.json
@@ -0,0 +1,6 @@
+{
+    "key": "ref",
+    "type": "text",
+    "label": "Taxiway Name",
+    "placeholder": "e.g. A5"
+}
diff --git a/data/presets/fields/tunnel.json b/data/presets/fields/tunnel.json
index 2c4f7751f..e349219b4 100644
--- a/data/presets/fields/tunnel.json
+++ b/data/presets/fields/tunnel.json
@@ -1,5 +1,6 @@
 {
     "key": "tunnel",
-    "type": "combo",
-    "label": "Tunnel"
+    "type": "typeCombo",
+    "label": "Type",
+    "placeholder": "Default"
 }
diff --git a/data/presets/fields/tunnel_waterway.json b/data/presets/fields/tunnel_waterway.json
new file mode 100644
index 000000000..2c4f7751f
--- /dev/null
+++ b/data/presets/fields/tunnel_waterway.json
@@ -0,0 +1,5 @@
+{
+    "key": "tunnel",
+    "type": "combo",
+    "label": "Tunnel"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 2118ed00c..936001dd7 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -54,6 +54,7 @@
         },
         "highway": {
             "fields": [
+                "name",
                 "highway"
             ],
             "geometry": [
@@ -70,6 +71,7 @@
         },
         "place": {
             "fields": [
+                "name",
                 "place"
             ],
             "geometry": [
@@ -120,6 +122,9 @@
                 "vertex",
                 "line"
             ],
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "junction": "roundabout"
             },
@@ -128,6 +133,7 @@
         },
         "waterway": {
             "fields": [
+                "name",
                 "waterway"
             ],
             "geometry": [
@@ -181,6 +187,7 @@
                 "ropeway"
             ],
             "fields": [
+                "name",
                 "aerialway/occupancy",
                 "aerialway/capacity",
                 "aerialway/duration",
@@ -196,6 +203,7 @@
                 "line"
             ],
             "fields": [
+                "name",
                 "aerialway/occupancy",
                 "aerialway/capacity",
                 "aerialway/duration",
@@ -212,6 +220,7 @@
                 "line"
             ],
             "fields": [
+                "name",
                 "aerialway/capacity",
                 "aerialway/duration"
             ],
@@ -225,6 +234,7 @@
                 "line"
             ],
             "fields": [
+                "name",
                 "aerialway/occupancy",
                 "aerialway/capacity",
                 "aerialway/duration",
@@ -241,6 +251,7 @@
                 "line"
             ],
             "fields": [
+                "name",
                 "aerialway/capacity",
                 "aerialway/duration"
             ],
@@ -254,6 +265,7 @@
                 "line"
             ],
             "fields": [
+                "name",
                 "aerialway/capacity",
                 "aerialway/duration",
                 "aerialway/heating"
@@ -268,6 +280,7 @@
                 "line"
             ],
             "fields": [
+                "name",
                 "aerialway/occupancy",
                 "aerialway/capacity",
                 "aerialway/duration",
@@ -288,6 +301,7 @@
                 "poma lift"
             ],
             "fields": [
+                "name",
                 "aerialway/capacity",
                 "aerialway/duration"
             ],
@@ -318,6 +332,7 @@
                 "bugel lift"
             ],
             "fields": [
+                "name",
                 "aerialway/capacity",
                 "aerialway/duration"
             ],
@@ -330,12 +345,14 @@
             "icon": "aerialway",
             "geometry": [
                 "point",
-                "vertex"
+                "vertex",
+                "area"
             ],
             "fields": [
                 "aerialway/access",
                 "aerialway/summer/access",
-                "elevation"
+                "elevation",
+                "building_area"
             ],
             "tags": {
                 "aerialway": "station"
@@ -347,9 +364,13 @@
                 "line"
             ],
             "fields": [
+                "name",
                 "aerialway/capacity",
                 "aerialway/duration"
             ],
+            "terms": [
+                "tbar"
+            ],
             "tags": {
                 "aerialway": "t-bar"
             },
@@ -362,7 +383,7 @@
                 "area"
             ],
             "fields": [
-                "ref",
+                "name",
                 "iata",
                 "icao",
                 "operator",
@@ -403,7 +424,7 @@
                 "point"
             ],
             "fields": [
-                "ref"
+                "ref_aeroway_gate"
             ],
             "tags": {
                 "aeroway": "gate"
@@ -415,6 +436,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "building_area"
             ],
             "tags": {
@@ -450,7 +472,7 @@
                 "landing strip"
             ],
             "fields": [
-                "ref",
+                "ref_runway",
                 "surface",
                 "length",
                 "width"
@@ -465,7 +487,7 @@
                 "line"
             ],
             "fields": [
-                "ref",
+                "ref_taxiway",
                 "surface"
             ],
             "tags": {
@@ -484,6 +506,7 @@
                 "aerodrome"
             ],
             "fields": [
+                "name",
                 "operator",
                 "building_area"
             ],
@@ -495,6 +518,7 @@
         "amenity/coworking_space": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -515,6 +539,7 @@
         "amenity/nursing_home": {
             "icon": "wheelchair",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -540,6 +565,7 @@
         "amenity/register_office": {
             "icon": "town-hall",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -579,6 +605,7 @@
         "amenity/animal_boarding": {
             "icon": "veterinary",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -609,6 +636,7 @@
         "amenity/animal_breeding": {
             "icon": "veterinary",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -641,6 +669,7 @@
         "amenity/animal_shelter": {
             "icon": "veterinary",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -674,6 +703,7 @@
         "amenity/arts_centre": {
             "icon": "theatre",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -712,6 +742,7 @@
         "amenity/bank": {
             "icon": "bank",
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -746,6 +777,7 @@
         "amenity/bar": {
             "icon": "bar",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -874,6 +906,7 @@
         "amenity/biergarten": {
             "icon": "beer",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -896,6 +929,7 @@
         },
         "amenity/boat_rental": {
             "fields": [
+                "name",
                 "operator"
             ],
             "geometry": [
@@ -910,6 +944,7 @@
         "amenity/bureau_de_change": {
             "icon": "bank",
             "fields": [
+                "name",
                 "operator",
                 "currency_multi"
             ],
@@ -929,6 +964,7 @@
         "amenity/bus_station": {
             "icon": "bus",
             "fields": [
+                "name",
                 "building_area",
                 "operator",
                 "internet_access",
@@ -947,6 +983,7 @@
         "amenity/cafe": {
             "icon": "cafe",
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -974,6 +1011,7 @@
         "amenity/car_rental": {
             "icon": "car",
             "fields": [
+                "name",
                 "operator"
             ],
             "geometry": [
@@ -988,6 +1026,7 @@
         "amenity/car_sharing": {
             "icon": "car",
             "fields": [
+                "name",
                 "operator",
                 "capacity"
             ],
@@ -1019,6 +1058,7 @@
         "amenity/casino": {
             "icon": "poi-dice",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -1064,6 +1104,7 @@
         "amenity/childcare": {
             "icon": "school",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -1086,6 +1127,7 @@
         "amenity/cinema": {
             "icon": "cinema",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -1112,6 +1154,7 @@
         "amenity/clinic": {
             "icon": "hospital",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -1132,6 +1175,7 @@
         "amenity/clock": {
             "icon": "poi-clock",
             "fields": [
+                "name",
                 "support",
                 "display",
                 "visibility",
@@ -1149,6 +1193,7 @@
         "amenity/college": {
             "icon": "college",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "internet_access",
@@ -1169,6 +1214,7 @@
         "amenity/community_centre": {
             "icon": "town-hall",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area"
@@ -1200,6 +1246,7 @@
         "amenity/courthouse": {
             "icon": "town-hall",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area"
@@ -1216,6 +1263,7 @@
         "amenity/crematorium": {
             "icon": "cemetery",
             "fields": [
+                "name",
                 "website",
                 "phone",
                 "opening_hours",
@@ -1237,6 +1285,7 @@
         "amenity/dentist": {
             "icon": "dentist",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -1257,6 +1306,7 @@
         "amenity/doctors": {
             "icon": "hospital",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -1276,6 +1326,7 @@
         "amenity/dojo": {
             "icon": "pitch",
             "fields": [
+                "name",
                 "sport",
                 "address",
                 "building_area",
@@ -1311,6 +1362,7 @@
         "amenity/driving_school": {
             "icon": "car",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -1328,6 +1380,7 @@
         "amenity/embassy": {
             "icon": "embassy",
             "fields": [
+                "name",
                 "country",
                 "address",
                 "building_area"
@@ -1344,6 +1397,7 @@
         "amenity/fast_food": {
             "icon": "fast-food",
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -1371,6 +1425,7 @@
         "amenity/ferry_terminal": {
             "icon": "ferry",
             "fields": [
+                "name",
                 "network",
                 "operator",
                 "address",
@@ -1390,6 +1445,7 @@
         "amenity/fire_station": {
             "icon": "fire-station",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area"
@@ -1407,6 +1463,7 @@
         "amenity/food_court": {
             "icon": "restaurant",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -1442,6 +1499,7 @@
         "amenity/fuel": {
             "icon": "fuel",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -1501,6 +1559,7 @@
         "amenity/hospital": {
             "icon": "hospital",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "emergency"
@@ -1551,6 +1610,7 @@
         "amenity/ice_cream": {
             "icon": "ice-cream",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -1577,6 +1637,7 @@
         "amenity/internet_cafe": {
             "icon": "poi-mast",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -1608,6 +1669,7 @@
         "amenity/kindergarten": {
             "icon": "school",
             "fields": [
+                "name",
                 "operator",
                 "address"
             ],
@@ -1627,6 +1689,7 @@
         "amenity/library": {
             "icon": "library",
             "fields": [
+                "name",
                 "operator",
                 "building_area",
                 "address",
@@ -1650,6 +1713,7 @@
         "amenity/marketplace": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -1685,6 +1749,7 @@
         "amenity/nightclub": {
             "icon": "bar",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -1781,6 +1846,7 @@
         "amenity/pharmacy": {
             "icon": "pharmacy",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -1804,6 +1870,7 @@
         "amenity/place_of_worship": {
             "icon": "place-of-worship",
             "fields": [
+                "name",
                 "religion",
                 "denomination",
                 "address",
@@ -1847,6 +1914,7 @@
         "amenity/place_of_worship/buddhist": {
             "icon": "buddhism",
             "fields": [
+                "name",
                 "denomination",
                 "building_area",
                 "address",
@@ -1878,6 +1946,7 @@
         "amenity/place_of_worship/christian": {
             "icon": "religious-christian",
             "fields": [
+                "name",
                 "denomination",
                 "building_area",
                 "address",
@@ -1923,6 +1992,7 @@
         "amenity/place_of_worship/hindu": {
             "icon": "poi-hinduist",
             "fields": [
+                "name",
                 "denomination",
                 "building_area",
                 "address",
@@ -1952,6 +2022,7 @@
         "amenity/place_of_worship/jewish": {
             "icon": "religious-jewish",
             "fields": [
+                "name",
                 "denomination",
                 "building_area",
                 "address",
@@ -1977,6 +2048,7 @@
         "amenity/place_of_worship/muslim": {
             "icon": "religious-muslim",
             "fields": [
+                "name",
                 "denomination",
                 "building_area",
                 "address",
@@ -2002,6 +2074,7 @@
         "amenity/place_of_worship/shinto": {
             "icon": "poi-shintoist",
             "fields": [
+                "name",
                 "denomination",
                 "building_area",
                 "address",
@@ -2028,6 +2101,7 @@
         "amenity/place_of_worship/sikh": {
             "icon": "poi-sikhist",
             "fields": [
+                "name",
                 "denomination",
                 "building_area",
                 "address",
@@ -2054,6 +2128,7 @@
         "amenity/place_of_worship/taoist": {
             "icon": "poi-taoist",
             "fields": [
+                "name",
                 "denomination",
                 "building_area",
                 "address",
@@ -2081,6 +2156,7 @@
         "amenity/planetarium": {
             "icon": "museum",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -2103,6 +2179,7 @@
         "amenity/police": {
             "icon": "police",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area"
@@ -2152,6 +2229,7 @@
         "amenity/post_office": {
             "icon": "post",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -2173,6 +2251,7 @@
         "amenity/prison": {
             "icon": "prison",
             "fields": [
+                "name",
                 "operator",
                 "address"
             ],
@@ -2192,6 +2271,7 @@
         "amenity/pub": {
             "icon": "beer",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -2218,6 +2298,7 @@
         "amenity/public_bath": {
             "icon": "water",
             "fields": [
+                "name",
                 "bath/type",
                 "bath/open_air",
                 "bath/sand_bath",
@@ -2262,6 +2343,7 @@
         },
         "amenity/ranger_station": {
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -2288,6 +2370,7 @@
         "amenity/recycling_centre": {
             "icon": "waste-basket",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -2342,6 +2425,7 @@
         "amenity/restaurant": {
             "icon": "restaurant",
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -2408,6 +2492,7 @@
         "amenity/school": {
             "icon": "school",
             "fields": [
+                "name",
                 "operator",
                 "address"
             ],
@@ -2429,6 +2514,7 @@
         "amenity/scrapyard": {
             "icon": "car",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours"
@@ -2460,6 +2546,7 @@
         "amenity/shelter": {
             "icon": "shelter",
             "fields": [
+                "name",
                 "shelter_type",
                 "bin"
             ],
@@ -2481,6 +2568,7 @@
         "amenity/social_facility": {
             "icon": "poi-social-facility",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -2502,6 +2590,7 @@
         "amenity/social_facility/food_bank": {
             "icon": "poi-social-facility",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -2527,6 +2616,7 @@
         "amenity/social_facility/group_home": {
             "icon": "wheelchair",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -2542,7 +2632,9 @@
             "terms": [
                 "old",
                 "senior",
-                "living"
+                "living",
+                "care home",
+                "assisted living"
             ],
             "tags": {
                 "amenity": "social_facility",
@@ -2558,6 +2650,7 @@
         "amenity/social_facility/homeless_shelter": {
             "icon": "poi-social-facility",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -2592,6 +2685,7 @@
         "amenity/social_facility/nursing_home": {
             "icon": "wheelchair",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -2609,7 +2703,8 @@
                 "living",
                 "nursing",
                 "old",
-                "senior"
+                "senior",
+                "assisted living"
             ],
             "tags": {
                 "amenity": "social_facility",
@@ -2625,6 +2720,7 @@
         "amenity/studio": {
             "icon": "karaoke",
             "fields": [
+                "name",
                 "studio",
                 "address",
                 "building_area"
@@ -2646,6 +2742,7 @@
         "amenity/taxi": {
             "icon": "car",
             "fields": [
+                "name",
                 "operator",
                 "capacity"
             ],
@@ -2679,6 +2776,7 @@
         "amenity/theatre": {
             "icon": "theatre",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area"
@@ -2734,6 +2832,7 @@
         "amenity/townhall": {
             "icon": "town-hall",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area"
@@ -2757,6 +2856,7 @@
         "amenity/university": {
             "icon": "college",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "internet_access",
@@ -2894,7 +2994,6 @@
             "fields": [
                 "operator",
                 "fee",
-                "bin",
                 "payment_multi",
                 "currency_multi"
             ],
@@ -3050,6 +3149,7 @@
         "amenity/veterinary": {
             "icon": "veterinary",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -3116,6 +3216,7 @@
         "amenity/waste_transfer_station": {
             "icon": "waste-basket",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours"
@@ -3192,6 +3293,9 @@
         },
         "area": {
             "name": "Area",
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "area": "yes"
             },
@@ -3202,6 +3306,7 @@
         },
         "area/highway": {
             "fields": [
+                "name",
                 "area/highway"
             ],
             "geometry": [
@@ -3468,12 +3573,14 @@
                 "boundary": "administrative"
             },
             "fields": [
+                "name",
                 "admin_level"
             ]
         },
         "building": {
             "icon": "home",
             "fields": [
+                "name",
                 "building",
                 "levels",
                 "address"
@@ -3491,6 +3598,7 @@
         },
         "building/bunker": {
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -3518,6 +3626,7 @@
         "building/train_station": {
             "icon": "building",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -3536,6 +3645,7 @@
         "building/apartments": {
             "icon": "building",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -3551,6 +3661,7 @@
         "building/barn": {
             "icon": "farm",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -3566,6 +3677,7 @@
         "building/cabin": {
             "icon": "home",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -3581,6 +3693,7 @@
         "building/cathedral": {
             "icon": "place-of-worship",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -3596,6 +3709,7 @@
         "building/chapel": {
             "icon": "place-of-worship",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -3611,6 +3725,7 @@
         "building/church": {
             "icon": "place-of-worship",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -3626,6 +3741,7 @@
         "building/college": {
             "icon": "building",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -3644,6 +3760,7 @@
         "building/commercial": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "address",
                 "levels",
                 "smoking"
@@ -3660,6 +3777,7 @@
         "building/construction": {
             "icon": "building",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -3675,6 +3793,7 @@
         "building/detached": {
             "icon": "home",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -3697,6 +3816,7 @@
         "building/dormitory": {
             "icon": "building",
             "fields": [
+                "name",
                 "address",
                 "levels",
                 "smoking"
@@ -3713,6 +3833,7 @@
         "building/garage": {
             "icon": "warehouse",
             "fields": [
+                "name",
                 "capacity"
             ],
             "geometry": [
@@ -3727,6 +3848,7 @@
         "building/garages": {
             "icon": "warehouse",
             "fields": [
+                "name",
                 "capacity"
             ],
             "geometry": [
@@ -3741,6 +3863,7 @@
         "building/greenhouse": {
             "icon": "garden-center",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -3756,6 +3879,7 @@
         "building/hospital": {
             "icon": "building",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -3771,6 +3895,7 @@
         "building/hotel": {
             "icon": "building",
             "fields": [
+                "name",
                 "address",
                 "levels",
                 "smoking"
@@ -3787,6 +3912,7 @@
         "building/house": {
             "icon": "home",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -3809,6 +3935,9 @@
             "geometry": [
                 "area"
             ],
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "building": "hut"
             },
@@ -3818,6 +3947,7 @@
         "building/industrial": {
             "icon": "industry",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -3833,6 +3963,7 @@
         "building/kindergarten": {
             "icon": "building",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -3852,6 +3983,7 @@
         "building/public": {
             "icon": "building",
             "fields": [
+                "name",
                 "address",
                 "levels",
                 "smoking"
@@ -3868,6 +4000,7 @@
         "building/residential": {
             "icon": "residential-community",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -3883,6 +4016,7 @@
         "building/retail": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "address",
                 "levels",
                 "smoking"
@@ -3899,6 +4033,7 @@
         "building/roof": {
             "icon": "shelter",
             "fields": [
+                "name",
                 "address"
             ],
             "geometry": [
@@ -3913,6 +4048,7 @@
         "building/school": {
             "icon": "building",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -3934,6 +4070,7 @@
         "building/semidetached_house": {
             "icon": "home",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -3958,6 +4095,7 @@
         "building/shed": {
             "icon": "home",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -3973,6 +4111,7 @@
         "building/stable": {
             "icon": "horse-riding",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -3988,6 +4127,7 @@
         "building/static_caravan": {
             "icon": "home",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -4003,6 +4143,7 @@
         "building/terrace": {
             "icon": "building",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -4026,6 +4167,7 @@
         "building/university": {
             "icon": "building",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -4044,6 +4186,7 @@
         "building/warehouse": {
             "icon": "warehouse",
             "fields": [
+                "name",
                 "address",
                 "levels"
             ],
@@ -4059,6 +4202,7 @@
         "camp_site/camp_pitch": {
             "icon": "campsite",
             "fields": [
+                "name",
                 "ref"
             ],
             "geometry": [
@@ -4077,6 +4221,7 @@
         "club": {
             "icon": "heart",
             "fields": [
+                "name",
                 "club",
                 "operator",
                 "address",
@@ -4098,6 +4243,7 @@
         "craft": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "craft",
                 "operator",
                 "address",
@@ -4117,6 +4263,7 @@
         "craft/jeweler": {
             "icon": "marker-stroked",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4139,6 +4286,7 @@
         "craft/locksmith": {
             "icon": "marker-stroked",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4161,6 +4309,7 @@
         "craft/optician": {
             "icon": "marker-stroked",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4183,6 +4332,7 @@
         "craft/tailor": {
             "icon": "clothing-store",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4209,6 +4359,7 @@
         "craft/basket_maker": {
             "icon": "art-gallery",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4226,6 +4377,7 @@
         "craft/beekeeper": {
             "icon": "farm",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4243,6 +4395,7 @@
         "craft/blacksmith": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4260,6 +4413,7 @@
         "craft/boatbuilder": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4277,6 +4431,7 @@
         "craft/bookbinder": {
             "icon": "library",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4297,6 +4452,7 @@
         "craft/brewery": {
             "icon": "poi-storage-tank",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4323,6 +4479,7 @@
         "craft/carpenter": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4343,6 +4500,7 @@
         "craft/carpet_layer": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4360,6 +4518,7 @@
         "craft/caterer": {
             "icon": "restaurant",
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -4378,6 +4537,7 @@
         "craft/clockmaker": {
             "icon": "poi-clock",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4395,6 +4555,7 @@
         "craft/confectionery": {
             "icon": "bakery",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4416,6 +4577,7 @@
         "craft/distillery": {
             "icon": "poi-storage-tank",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4454,6 +4616,7 @@
         "craft/dressmaker": {
             "icon": "clothing-store",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4474,6 +4637,7 @@
         "craft/electrician": {
             "icon": "poi-power",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4495,6 +4659,7 @@
         "craft/electronics_repair": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4512,6 +4677,7 @@
         "craft/gardener": {
             "icon": "garden",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4533,6 +4699,7 @@
         "craft/glaziery": {
             "icon": "fire-station",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4555,6 +4722,7 @@
         "craft/handicraft": {
             "icon": "art-gallery",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4572,6 +4740,7 @@
         "craft/hvac": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4594,6 +4763,7 @@
         "craft/insulator": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4611,6 +4781,7 @@
         "craft/key_cutter": {
             "icon": "marker-stroked",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4628,6 +4799,7 @@
         "craft/metal_construction": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4645,6 +4817,7 @@
         "craft/painter": {
             "icon": "art-gallery",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4662,6 +4835,7 @@
         "craft/photographer": {
             "icon": "attraction",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4679,6 +4853,7 @@
         "craft/photographic_laboratory": {
             "icon": "attraction",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4699,6 +4874,7 @@
         "craft/plasterer": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4716,6 +4892,7 @@
         "craft/plumber": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4736,6 +4913,7 @@
         "craft/pottery": {
             "icon": "art-gallery",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4756,6 +4934,7 @@
         "craft/rigger": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4773,6 +4952,7 @@
         "craft/roofer": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4790,6 +4970,7 @@
         "craft/saddler": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4807,6 +4988,7 @@
         "craft/sailmaker": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4824,6 +5006,7 @@
         "craft/sawmill": {
             "icon": "logging",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4844,6 +5027,7 @@
         "craft/scaffolder": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4861,6 +5045,7 @@
         "craft/sculpter": {
             "icon": "art-gallery",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4878,6 +5063,7 @@
         "craft/shoemaker": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4898,6 +5084,7 @@
         "craft/stonemason": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4918,6 +5105,7 @@
         "craft/sweep": {
             "icon": "poi-chimney",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4935,6 +5123,7 @@
         "craft/tiler": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4952,6 +5141,7 @@
         "craft/tinsmith": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4969,6 +5159,7 @@
         "craft/upholsterer": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -4986,6 +5177,7 @@
         "craft/watchmaker": {
             "icon": "poi-clock",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -5003,6 +5195,7 @@
         "craft/window_construction": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -5023,6 +5216,7 @@
         "craft/winery": {
             "icon": "alcohol-shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -5128,6 +5322,7 @@
         "emergency/ambulance_station": {
             "icon": "hospital",
             "fields": [
+                "name",
                 "operator",
                 "building_area",
                 "address"
@@ -5216,6 +5411,7 @@
         },
         "footway/crossing": {
             "fields": [
+                "name",
                 "crossing",
                 "access",
                 "surface",
@@ -5239,6 +5435,7 @@
         "footway/crosswalk": {
             "icon": "highway-footway",
             "fields": [
+                "name",
                 "crossing",
                 "access",
                 "surface",
@@ -5265,6 +5462,7 @@
         "footway/sidewalk": {
             "icon": "highway-footway",
             "fields": [
+                "name",
                 "surface",
                 "lit",
                 "width",
@@ -5296,6 +5494,9 @@
         },
         "golf/bunker": {
             "icon": "golf",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "area"
             ],
@@ -5315,6 +5516,9 @@
         },
         "golf/fairway": {
             "icon": "golf",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "area"
             ],
@@ -5330,6 +5534,9 @@
         },
         "golf/green": {
             "icon": "golf",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "area"
             ],
@@ -5348,7 +5555,8 @@
         "golf/hole": {
             "icon": "golf",
             "fields": [
-                "golf_hole",
+                "name",
+                "ref_golf_hole",
                 "par",
                 "handicap"
             ],
@@ -5362,6 +5570,9 @@
         },
         "golf/lateral_water_hazard_area": {
             "icon": "golf",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "area"
             ],
@@ -5377,6 +5588,9 @@
         },
         "golf/lateral_water_hazard_line": {
             "icon": "golf",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "line"
             ],
@@ -5387,6 +5601,9 @@
         },
         "golf/rough": {
             "icon": "golf",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "area"
             ],
@@ -5402,6 +5619,9 @@
         },
         "golf/tee": {
             "icon": "golf",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "area"
             ],
@@ -5420,6 +5640,9 @@
         },
         "golf/water_hazard_area": {
             "icon": "golf",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "area"
             ],
@@ -5435,6 +5658,9 @@
         },
         "golf/water_hazard_line": {
             "icon": "golf",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "line"
             ],
@@ -5446,6 +5672,7 @@
         "healthcare/blood_donation": {
             "icon": "blood-bank",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "blood_components",
@@ -5472,6 +5699,7 @@
         },
         "highway/bridleway": {
             "fields": [
+                "name",
                 "surface",
                 "width",
                 "structure",
@@ -5494,6 +5722,7 @@
         "highway/bus_stop": {
             "icon": "bus",
             "fields": [
+                "name",
                 "network",
                 "operator",
                 "bench",
@@ -5512,6 +5741,7 @@
         "highway/corridor": {
             "icon": "highway-footway",
             "fields": [
+                "name",
                 "width",
                 "level",
                 "access_simple"
@@ -5534,6 +5764,7 @@
         },
         "highway/crossing": {
             "fields": [
+                "name",
                 "crossing",
                 "kerb",
                 "tactile_paving"
@@ -5554,6 +5785,7 @@
         "highway/crosswalk": {
             "icon": "poi-foot",
             "fields": [
+                "name",
                 "crossing",
                 "kerb",
                 "tactile_paving"
@@ -5577,6 +5809,7 @@
         "highway/cycleway": {
             "icon": "highway-cycleway",
             "fields": [
+                "name",
                 "oneway",
                 "surface",
                 "lit",
@@ -5617,6 +5850,7 @@
         "highway/footway": {
             "icon": "highway-footway",
             "fields": [
+                "name",
                 "surface",
                 "lit",
                 "width",
@@ -5660,6 +5894,7 @@
         "highway/living_street": {
             "icon": "highway-living-street",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "lanes",
@@ -5699,14 +5934,15 @@
                 "highway": "motorway_junction"
             },
             "fields": [
-                "ref"
+                "ref_highway_junction"
             ],
             "name": "Motorway Junction / Exit"
         },
         "highway/motorway_link": {
             "icon": "highway-motorway-link",
             "fields": [
-                "ref",
+                "name",
+                "ref_road_number",
                 "oneway_yes",
                 "maxspeed",
                 "lanes",
@@ -5739,7 +5975,8 @@
         "highway/motorway": {
             "icon": "highway-motorway",
             "fields": [
-                "ref",
+                "name",
+                "ref_road_number",
                 "oneway_yes",
                 "maxspeed",
                 "lanes",
@@ -5770,6 +6007,7 @@
         "highway/path": {
             "icon": "highway-path",
             "fields": [
+                "name",
                 "surface",
                 "width",
                 "structure",
@@ -5800,6 +6038,7 @@
         "highway/pedestrian": {
             "icon": "highway-footway",
             "fields": [
+                "name",
                 "surface",
                 "lit",
                 "width",
@@ -5820,12 +6059,13 @@
         "highway/primary_link": {
             "icon": "highway-primary-link",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "lanes",
                 "surface",
                 "maxheight",
-                "ref",
+                "ref_road_number",
                 "cycleway",
                 "structure",
                 "access"
@@ -5846,13 +6086,14 @@
         "highway/primary": {
             "icon": "highway-primary",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "lanes",
                 "surface",
                 "structure",
                 "maxheight",
-                "ref",
+                "ref_road_number",
                 "cycleway",
                 "access"
             ],
@@ -5868,6 +6109,7 @@
         "highway/raceway": {
             "icon": "highway-unclassified",
             "fields": [
+                "name",
                 "oneway",
                 "surface",
                 "sport_racing_motor",
@@ -5902,6 +6144,7 @@
         "highway/residential": {
             "icon": "highway-residential",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "lanes",
@@ -5922,6 +6165,9 @@
         },
         "highway/rest_area": {
             "icon": "car",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "point",
                 "vertex",
@@ -5938,6 +6184,7 @@
         "highway/road": {
             "icon": "highway-road",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "lanes",
@@ -5958,13 +6205,14 @@
         "highway/secondary_link": {
             "icon": "highway-secondary-link",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "lanes",
                 "surface",
                 "structure",
                 "maxheight",
-                "ref",
+                "ref_road_number",
                 "cycleway",
                 "access"
             ],
@@ -5984,13 +6232,14 @@
         "highway/secondary": {
             "icon": "highway-secondary",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "lanes",
                 "surface",
                 "structure",
                 "maxheight",
-                "ref",
+                "ref_road_number",
                 "cycleway",
                 "access"
             ],
@@ -6006,6 +6255,7 @@
         "highway/service": {
             "icon": "highway-service",
             "fields": [
+                "name",
                 "service",
                 "oneway",
                 "maxspeed",
@@ -6026,6 +6276,7 @@
         "highway/service/alley": {
             "icon": "highway-service",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "structure",
@@ -6049,6 +6300,7 @@
         "highway/service/drive-through": {
             "icon": "highway-service",
             "fields": [
+                "name",
                 "oneway",
                 "covered",
                 "maxheight",
@@ -6073,6 +6325,7 @@
         "highway/service/driveway": {
             "icon": "highway-service",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "structure",
@@ -6096,6 +6349,7 @@
         "highway/service/emergency_access": {
             "icon": "highway-service",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "structure",
@@ -6119,6 +6373,7 @@
         "highway/service/parking_aisle": {
             "icon": "highway-service",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "structure",
@@ -6141,6 +6396,9 @@
         },
         "highway/services": {
             "icon": "car",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "point",
                 "vertex",
@@ -6236,13 +6494,14 @@
         "highway/tertiary_link": {
             "icon": "highway-tertiary-link",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "lanes",
                 "surface",
                 "structure",
                 "maxheight",
-                "ref",
+                "ref_road_number",
                 "cycleway",
                 "access"
             ],
@@ -6262,13 +6521,14 @@
         "highway/tertiary": {
             "icon": "highway-tertiary",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "lanes",
                 "surface",
                 "structure",
                 "maxheight",
-                "ref",
+                "ref_road_number",
                 "cycleway",
                 "access"
             ],
@@ -6284,6 +6544,7 @@
         "highway/track": {
             "icon": "highway-track",
             "fields": [
+                "name",
                 "tracktype",
                 "surface",
                 "width",
@@ -6366,7 +6627,8 @@
         "highway/trunk_link": {
             "icon": "highway-trunk-link",
             "fields": [
-                "ref",
+                "name",
+                "ref_road_number",
                 "oneway",
                 "maxspeed",
                 "lanes",
@@ -6391,7 +6653,8 @@
         "highway/trunk": {
             "icon": "highway-trunk",
             "fields": [
-                "ref",
+                "name",
+                "ref_road_number",
                 "oneway",
                 "maxspeed",
                 "lanes",
@@ -6439,6 +6702,7 @@
         "highway/unclassified": {
             "icon": "highway-unclassified",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "lanes",
@@ -6476,6 +6740,7 @@
         "historic/archaeological_site": {
             "icon": "poi-ruins",
             "fields": [
+                "name",
                 "historic/civilization",
                 "inscription"
             ],
@@ -6490,8 +6755,9 @@
             "name": "Archaeological Site"
         },
         "historic/boundary_stone": {
-            "icon": "monument",
+            "icon": "poi-milestone",
             "fields": [
+                "name",
                 "inscription"
             ],
             "geometry": [
@@ -6506,6 +6772,7 @@
         "historic/castle": {
             "icon": "castle",
             "fields": [
+                "name",
                 "castle_type",
                 "building_area",
                 "historic/civilization"
@@ -6522,6 +6789,7 @@
         "historic/memorial": {
             "icon": "monument",
             "fields": [
+                "name",
                 "inscription"
             ],
             "geometry": [
@@ -6537,6 +6805,7 @@
         "historic/monument": {
             "icon": "monument",
             "fields": [
+                "name",
                 "inscription"
             ],
             "geometry": [
@@ -6552,6 +6821,7 @@
         "historic/ruins": {
             "icon": "poi-ruins",
             "fields": [
+                "name",
                 "historic/civilization",
                 "inscription"
             ],
@@ -6568,6 +6838,7 @@
         "historic/tomb": {
             "icon": "cemetery",
             "fields": [
+                "name",
                 "tomb",
                 "building_area",
                 "inscription"
@@ -6584,6 +6855,7 @@
         "historic/wayside_cross": {
             "icon": "religious-christian",
             "fields": [
+                "name",
                 "inscription"
             ],
             "geometry": [
@@ -6599,6 +6871,7 @@
         "historic/wayside_shrine": {
             "icon": "landmark",
             "fields": [
+                "name",
                 "inscription"
             ],
             "geometry": [
@@ -6613,6 +6886,9 @@
         },
         "junction": {
             "icon": "poi-junction",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "vertex",
                 "area"
@@ -6624,6 +6900,7 @@
         },
         "landuse": {
             "fields": [
+                "name",
                 "landuse"
             ],
             "geometry": [
@@ -6638,6 +6915,7 @@
         "landuse/farm": {
             "icon": "farm",
             "fields": [
+                "name",
                 "operator",
                 "crop"
             ],
@@ -6656,6 +6934,9 @@
             "geometry": [
                 "area"
             ],
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "landuse": "allotments"
             },
@@ -6668,6 +6949,7 @@
         "landuse/aquaculture": {
             "icon": "aquarium",
             "fields": [
+                "name",
                 "operator",
                 "produce"
             ],
@@ -6691,6 +6973,9 @@
         },
         "landuse/basin": {
             "icon": "water",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "area"
             ],
@@ -6703,6 +6988,7 @@
         "landuse/cemetery": {
             "icon": "cemetery",
             "fields": [
+                "name",
                 "religion",
                 "denomination"
             ],
@@ -6717,6 +7003,7 @@
         },
         "landuse/churchyard": {
             "fields": [
+                "name",
                 "religion",
                 "denomination"
             ],
@@ -6731,6 +7018,9 @@
         },
         "landuse/commercial": {
             "icon": "commercial",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "area"
             ],
@@ -6742,6 +7032,7 @@
         },
         "landuse/construction": {
             "fields": [
+                "name",
                 "construction",
                 "operator"
             ],
@@ -6757,6 +7048,7 @@
         "landuse/farmland": {
             "icon": "farm",
             "fields": [
+                "name",
                 "operator",
                 "crop",
                 "produce"
@@ -6777,6 +7069,7 @@
         "landuse/farmyard": {
             "icon": "farm",
             "fields": [
+                "name",
                 "operator",
                 "crop"
             ],
@@ -6796,6 +7089,7 @@
         "landuse/forest": {
             "icon": "park-alt1",
             "fields": [
+                "name",
                 "leaf_type",
                 "leaf_cycle",
                 "produce"
@@ -6815,6 +7109,9 @@
             "geometry": [
                 "area"
             ],
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "landuse": "garages"
             },
@@ -6834,6 +7131,7 @@
         "landuse/harbour": {
             "icon": "harbor",
             "fields": [
+                "name",
                 "operator"
             ],
             "geometry": [
@@ -6849,6 +7147,9 @@
         },
         "landuse/industrial": {
             "icon": "industry",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "area"
             ],
@@ -6863,6 +7164,9 @@
             "geometry": [
                 "area"
             ],
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "landuse": "landfill"
             },
@@ -6875,6 +7179,9 @@
             "geometry": [
                 "area"
             ],
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "landuse": "meadow"
             },
@@ -6883,6 +7190,9 @@
         },
         "landuse/military": {
             "icon": "poi-military",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "area"
             ],
@@ -6896,7 +7206,7 @@
         "landuse/military/airfield": {
             "icon": "airfield",
             "fields": [
-                "ref",
+                "name",
                 "iata",
                 "icao"
             ],
@@ -6936,6 +7246,7 @@
         "landuse/military/barracks": {
             "icon": "poi-military",
             "fields": [
+                "name",
                 "building_area"
             ],
             "geometry": [
@@ -6970,6 +7281,7 @@
         "landuse/military/bunker": {
             "icon": "poi-military",
             "fields": [
+                "name",
                 "bunker_type",
                 "building_area"
             ],
@@ -7006,6 +7318,9 @@
         },
         "landuse/military/checkpoint": {
             "icon": "barrier",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "point",
                 "vertex",
@@ -7037,6 +7352,9 @@
         },
         "landuse/military/danger_area": {
             "icon": "danger",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "point",
                 "vertex",
@@ -7072,6 +7390,9 @@
         },
         "landuse/military/naval_base": {
             "icon": "poi-military",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "point",
                 "area"
@@ -7103,6 +7424,9 @@
         },
         "landuse/military/nuclear_explosion_site": {
             "icon": "danger",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "point",
                 "vertex",
@@ -7162,6 +7486,7 @@
         "landuse/military/office": {
             "icon": "poi-military",
             "fields": [
+                "name",
                 "building_area"
             ],
             "geometry": [
@@ -7197,6 +7522,9 @@
         },
         "landuse/military/range": {
             "icon": "poi-military",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "point",
                 "area"
@@ -7234,6 +7562,9 @@
         },
         "landuse/military/training_area": {
             "icon": "poi-military",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "point",
                 "area"
@@ -7272,6 +7603,7 @@
         "landuse/orchard": {
             "icon": "park-alt1",
             "fields": [
+                "name",
                 "operator",
                 "trees"
             ],
@@ -7289,6 +7621,7 @@
         "landuse/plant_nursery": {
             "icon": "garden",
             "fields": [
+                "name",
                 "operator",
                 "plant"
             ],
@@ -7310,6 +7643,9 @@
             "geometry": [
                 "area"
             ],
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "landuse": "quarry"
             },
@@ -7339,6 +7675,9 @@
             "geometry": [
                 "area"
             ],
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "landuse": "recreation_ground"
             },
@@ -7363,6 +7702,9 @@
             "geometry": [
                 "area"
             ],
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "landuse": "retail"
             },
@@ -7370,6 +7712,7 @@
         },
         "landuse/vineyard": {
             "fields": [
+                "name",
                 "operator",
                 "grape_variety"
             ],
@@ -7397,6 +7740,7 @@
         "leisure": {
             "icon": "pitch",
             "fields": [
+                "name",
                 "leisure"
             ],
             "geometry": [
@@ -7412,6 +7756,7 @@
         "leisure/adult_gaming_centre": {
             "icon": "poi-dice",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -7452,6 +7797,7 @@
         "leisure/bowling_alley": {
             "icon": "poi-bowling",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -7474,6 +7820,9 @@
                 "point",
                 "area"
             ],
+            "fields": [
+                "name"
+            ],
             "terms": [
                 "open space"
             ],
@@ -7485,6 +7834,7 @@
         "leisure/dance": {
             "icon": "music",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -7512,6 +7862,9 @@
                 "point",
                 "area"
             ],
+            "fields": [
+                "name"
+            ],
             "terms": [],
             "tags": {
                 "leisure": "dog_park"
@@ -7536,6 +7889,7 @@
         "leisure/fitness_centre": {
             "icon": "pitch",
             "fields": [
+                "name",
                 "sport",
                 "address",
                 "building_area",
@@ -7559,6 +7913,7 @@
         "leisure/fitness_centre/yoga": {
             "icon": "pitch",
             "fields": [
+                "name",
                 "sport",
                 "address",
                 "building_area",
@@ -7584,6 +7939,7 @@
         "leisure/fitness_station": {
             "icon": "pitch",
             "fields": [
+                "name",
                 "sport",
                 "address",
                 "opening_hours"
@@ -7604,6 +7960,7 @@
         "leisure/garden": {
             "icon": "garden",
             "fields": [
+                "name",
                 "access_simple"
             ],
             "geometry": [
@@ -7619,6 +7976,7 @@
         "leisure/golf_course": {
             "icon": "golf",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours"
@@ -7638,6 +7996,7 @@
         "leisure/horse_riding": {
             "icon": "horse-riding",
             "fields": [
+                "name",
                 "access_simple",
                 "operator",
                 "address",
@@ -7659,6 +8018,7 @@
         "leisure/ice_rink": {
             "icon": "pitch",
             "fields": [
+                "name",
                 "seasonal",
                 "sport_ice",
                 "operator",
@@ -7683,6 +8043,7 @@
         "leisure/marina": {
             "icon": "harbor",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "capacity",
@@ -7709,6 +8070,7 @@
         "leisure/miniature_golf": {
             "icon": "golf",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours"
@@ -7733,6 +8095,9 @@
                 "point",
                 "area"
             ],
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "leisure": "nature_reserve"
             },
@@ -7748,6 +8113,9 @@
                 "point",
                 "area"
             ],
+            "fields": [
+                "name"
+            ],
             "terms": [
                 "esplanade",
                 "estate",
@@ -8145,6 +8513,7 @@
         "leisure/resort": {
             "icon": "lodging",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours"
@@ -8202,6 +8571,7 @@
         "leisure/sports_centre": {
             "icon": "pitch",
             "fields": [
+                "name",
                 "sport",
                 "address",
                 "building_area",
@@ -8220,6 +8590,7 @@
         "leisure/sports_centre/swimming": {
             "icon": "swimming",
             "fields": [
+                "name",
                 "access_simple",
                 "operator",
                 "address",
@@ -8246,6 +8617,7 @@
         "leisure/stadium": {
             "icon": "pitch",
             "fields": [
+                "name",
                 "sport",
                 "address"
             ],
@@ -8261,6 +8633,7 @@
         "leisure/swimming_pool": {
             "icon": "swimming",
             "fields": [
+                "name",
                 "access_simple",
                 "operator",
                 "address"
@@ -8308,6 +8681,7 @@
         "leisure/water_park": {
             "icon": "swimming",
             "fields": [
+                "name",
                 "operator",
                 "address"
             ],
@@ -8327,6 +8701,9 @@
         },
         "line": {
             "name": "Line",
+            "fields": [
+                "name"
+            ],
             "tags": {},
             "geometry": [
                 "line"
@@ -8336,6 +8713,7 @@
         "man_made": {
             "icon": "poi-storage-tank",
             "fields": [
+                "name",
                 "man_made"
             ],
             "geometry": [
@@ -8540,7 +8918,8 @@
                 "area"
             ],
             "terms": [
-                "dock"
+                "dock",
+                "jetty"
             ],
             "tags": {
                 "man_made": "pier"
@@ -8709,6 +9088,7 @@
         "man_made/wastewater_plant": {
             "icon": "water",
             "fields": [
+                "name",
                 "operator",
                 "address"
             ],
@@ -8757,6 +9137,7 @@
         "man_made/water_works": {
             "icon": "water",
             "fields": [
+                "name",
                 "operator",
                 "address"
             ],
@@ -8810,6 +9191,7 @@
         "man_made/works": {
             "icon": "industry",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -8883,9 +9265,33 @@
             ],
             "name": "Storm Drain"
         },
+        "manhole/telecom": {
+            "icon": "circle-stroked",
+            "fields": [
+                "operator",
+                "ref"
+            ],
+            "geometry": [
+                "point",
+                "vertex"
+            ],
+            "tags": {
+                "manhole": "telecom"
+            },
+            "terms": [
+                "cover",
+                "phone",
+                "hole",
+                "telecom",
+                "telephone",
+                "bt"
+            ],
+            "name": "Telecom Manhole"
+        },
         "natural": {
             "icon": "natural",
             "fields": [
+                "name",
                 "natural"
             ],
             "geometry": [
@@ -8916,6 +9322,9 @@
                 "point",
                 "area"
             ],
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "natural": "bay"
             },
@@ -9035,6 +9444,7 @@
         "natural/peak": {
             "icon": "mountain",
             "fields": [
+                "name",
                 "elevation"
             ],
             "geometry": [
@@ -9177,6 +9587,7 @@
         "natural/volcano": {
             "icon": "volcano",
             "fields": [
+                "name",
                 "elevation"
             ],
             "geometry": [
@@ -9210,6 +9621,9 @@
             "geometry": [
                 "area"
             ],
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "natural": "water",
                 "water": "lake"
@@ -9230,6 +9644,9 @@
             "geometry": [
                 "area"
             ],
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "natural": "water",
                 "water": "pond"
@@ -9252,6 +9669,9 @@
             "geometry": [
                 "area"
             ],
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "natural": "water",
                 "water": "reservoir"
@@ -9317,6 +9737,7 @@
         "office": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "office",
                 "address",
                 "building_area",
@@ -9337,6 +9758,7 @@
         "office/travel_agent": {
             "icon": "suitcase",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -9360,6 +9782,7 @@
         "office/accountant": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -9378,6 +9801,7 @@
         "office/administrative": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -9396,6 +9820,7 @@
         "office/architect": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -9414,6 +9839,7 @@
         "office/company": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -9433,6 +9859,7 @@
         "office/coworking": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -9460,6 +9887,7 @@
         "office/educational_institution": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -9478,6 +9906,7 @@
         "office/employment_agency": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -9498,6 +9927,7 @@
         "office/estate_agent": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -9516,6 +9946,7 @@
         "office/financial": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -9534,6 +9965,7 @@
         "office/government": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -9552,6 +9984,7 @@
         "office/government/register_office": {
             "icon": "town-hall",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -9581,6 +10014,7 @@
         "office/insurance": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -9599,6 +10033,7 @@
         "office/it": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -9617,6 +10052,7 @@
         "office/lawyer": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -9635,6 +10071,7 @@
         "office/lawyer/notary": {
             "icon": "suitcase",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -9664,6 +10101,7 @@
         "office/newspaper": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -9682,6 +10120,7 @@
         "office/ngo": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -9701,6 +10140,7 @@
         "office/physician": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -9719,6 +10159,7 @@
         "office/political_party": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -9737,6 +10178,7 @@
         "office/research": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -9755,6 +10197,7 @@
         "office/telecommunication": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -9773,6 +10216,7 @@
         "office/therapist": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours"
@@ -9791,6 +10235,7 @@
         "piste": {
             "icon": "skiing",
             "fields": [
+                "name",
                 "piste/type",
                 "piste/difficulty",
                 "piste/grooming",
@@ -9822,6 +10267,9 @@
                 "point",
                 "area"
             ],
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "place": "farm"
             },
@@ -9831,6 +10279,7 @@
         "place/city": {
             "icon": "city",
             "fields": [
+                "name",
                 "population"
             ],
             "geometry": [
@@ -9845,6 +10294,7 @@
         "place/hamlet": {
             "icon": "triangle-stroked",
             "fields": [
+                "name",
                 "population"
             ],
             "geometry": [
@@ -9862,6 +10312,9 @@
                 "point",
                 "area"
             ],
+            "fields": [
+                "name"
+            ],
             "terms": [
                 "archipelago",
                 "atoll",
@@ -9883,6 +10336,9 @@
                 "point",
                 "area"
             ],
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "place": "isolated_dwelling"
             },
@@ -9894,6 +10350,9 @@
                 "point",
                 "area"
             ],
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "place": "locality"
             },
@@ -9902,6 +10361,7 @@
         "place/neighbourhood": {
             "icon": "triangle-stroked",
             "fields": [
+                "name",
                 "population"
             ],
             "geometry": [
@@ -9919,6 +10379,7 @@
         "place/quarter": {
             "icon": "triangle-stroked",
             "fields": [
+                "name",
                 "population"
             ],
             "geometry": [
@@ -9941,6 +10402,9 @@
                 "point",
                 "area"
             ],
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "place": "square"
             },
@@ -9949,6 +10413,7 @@
         "place/suburb": {
             "icon": "triangle-stroked",
             "fields": [
+                "name",
                 "population"
             ],
             "geometry": [
@@ -9968,6 +10433,7 @@
         "place/town": {
             "icon": "town",
             "fields": [
+                "name",
                 "population"
             ],
             "geometry": [
@@ -9982,6 +10448,7 @@
         "place/village": {
             "icon": "village",
             "fields": [
+                "name",
                 "population"
             ],
             "geometry": [
@@ -9995,6 +10462,9 @@
         },
         "point": {
             "name": "Point",
+            "fields": [
+                "name"
+            ],
             "tags": {},
             "geometry": [
                 "point"
@@ -10133,6 +10603,7 @@
         "power/plant": {
             "icon": "industry",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "plant/output/electricity",
@@ -10212,7 +10683,8 @@
         "public_transport/platform": {
             "icon": "bus",
             "fields": [
-                "ref",
+                "name",
+                "ref_platform",
                 "network",
                 "operator",
                 "shelter"
@@ -10231,7 +10703,8 @@
         "public_transport/stop_position": {
             "icon": "bus",
             "fields": [
-                "ref",
+                "name",
+                "ref_stop_position",
                 "network",
                 "operator"
             ],
@@ -10252,12 +10725,28 @@
                 "railway": "abandoned"
             },
             "fields": [
+                "name",
                 "structure",
                 "service_rail"
             ],
             "terms": [],
             "name": "Abandoned Railway"
         },
+        "railway/buffer_stop": {
+            "icon": "poi-buffer-stop",
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "railway": "buffer_stop"
+            },
+            "terms": [
+                "stop",
+                "halt",
+                "buffer"
+            ],
+            "name": "Buffer Stop"
+        },
         "railway/crossing": {
             "icon": "cross",
             "geometry": [
@@ -10277,6 +10766,19 @@
             ],
             "name": "Railway Crossing (Path)"
         },
+        "railway/derail": {
+            "icon": "roadblock",
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "railway": "derail"
+            },
+            "terms": [
+                "derailer"
+            ],
+            "name": "Railway Derailer"
+        },
         "railway/disused": {
             "icon": "railway-disused",
             "geometry": [
@@ -10350,6 +10852,24 @@
             ],
             "name": "Railway Crossing (Road)"
         },
+        "railway/milestone": {
+            "icon": "poi-milestone",
+            "geometry": [
+                "point",
+                "vertex"
+            ],
+            "fields": [
+                "milestone_position"
+            ],
+            "tags": {
+                "railway": "milestone"
+            },
+            "terms": [
+                "milestone",
+                "marker"
+            ],
+            "name": "Railway Milestone"
+        },
         "railway/monorail": {
             "icon": "railway-monorail",
             "geometry": [
@@ -10359,6 +10879,7 @@
                 "railway": "monorail"
             },
             "fields": [
+                "name",
                 "structure",
                 "electrified",
                 "service_rail"
@@ -10375,6 +10896,7 @@
                 "railway": "narrow_gauge"
             },
             "fields": [
+                "name",
                 "structure",
                 "gauge",
                 "electrified",
@@ -10387,10 +10909,15 @@
             "name": "Narrow Gauge Rail"
         },
         "railway/platform": {
-            "icon": "rail",
+            "icon": "highway-footway",
+            "fields": [
+                "name",
+                "ref_platform",
+                "surface",
+                "lit",
+                "shelter"
+            ],
             "geometry": [
-                "point",
-                "vertex",
                 "line",
                 "area"
             ],
@@ -10408,6 +10935,7 @@
                 "railway": "rail"
             },
             "fields": [
+                "name",
                 "structure",
                 "gauge",
                 "electrified",
@@ -10417,9 +10945,25 @@
             "terms": [],
             "name": "Rail"
         },
+        "railway/signal": {
+            "icon": "poi-railway-signals",
+            "geometry": [
+                "point",
+                "vertex"
+            ],
+            "tags": {
+                "railway": "signal"
+            },
+            "terms": [
+                "signal",
+                "lights"
+            ],
+            "name": "Railway Signal"
+        },
         "railway/station": {
             "icon": "rail",
             "fields": [
+                "name",
                 "network",
                 "operator",
                 "address",
@@ -10448,6 +10992,9 @@
                 "point",
                 "vertex"
             ],
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "railway": "subway_entrance"
             },
@@ -10466,6 +11013,7 @@
                 "railway": "subway"
             },
             "fields": [
+                "name",
                 "structure",
                 "gauge",
                 "electrified",
@@ -10477,9 +11025,44 @@
             ],
             "name": "Subway"
         },
+        "railway/switch": {
+            "icon": "poi-junction",
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "railway": "switch"
+            },
+            "terms": [
+                "switch",
+                "points"
+            ],
+            "name": "Railway Switch"
+        },
+        "railway/train_wash": {
+            "icon": "rail",
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "fields": [
+                "operator",
+                "building_area"
+            ],
+            "tags": {
+                "railway": "wash"
+            },
+            "terms": [
+                "wash",
+                "clean"
+            ],
+            "name": "Train Wash"
+        },
         "railway/tram_stop": {
             "icon": "rail-light",
             "fields": [
+                "name",
                 "network",
                 "operator"
             ],
@@ -10506,6 +11089,7 @@
                 "railway": "tram"
             },
             "fields": [
+                "name",
                 "structure",
                 "gauge",
                 "electrified",
@@ -10527,6 +11111,7 @@
                 "relation"
             ],
             "fields": [
+                "name",
                 "relation"
             ]
         },
@@ -10535,6 +11120,9 @@
             "geometry": [
                 "line"
             ],
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "route": "ferry"
             },
@@ -10543,6 +11131,7 @@
         "shop": {
             "icon": "shop",
             "fields": [
+                "name",
                 "shop",
                 "operator",
                 "address",
@@ -10562,6 +11151,7 @@
         "shop/fishmonger": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -10584,6 +11174,7 @@
         "shop/vacant": {
             "icon": "shop",
             "fields": [
+                "name",
                 "address",
                 "building_area"
             ],
@@ -10600,6 +11191,7 @@
         "shop/alcohol": {
             "icon": "alcohol-shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -10624,6 +11216,7 @@
         "shop/anime": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -10648,6 +11241,7 @@
         "shop/antiques": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -10665,6 +11259,7 @@
         "shop/appliance": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -10697,6 +11292,7 @@
         "shop/art": {
             "icon": "shop",
             "fields": [
+                "name",
                 "artwork_type",
                 "operator",
                 "address",
@@ -10720,6 +11316,7 @@
         "shop/baby_goods": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -10737,6 +11334,7 @@
         "shop/bag": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -10758,6 +11356,7 @@
         "shop/bakery": {
             "icon": "bakery",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -10775,6 +11374,7 @@
         "shop/bathroom_furnishing": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -10792,6 +11392,7 @@
         "shop/beauty": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -10815,6 +11416,7 @@
         "shop/beauty/nails": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -10841,6 +11443,7 @@
         "shop/beauty/tanning": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -10863,6 +11466,7 @@
         "shop/bed": {
             "icon": "lodging",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -10880,6 +11484,7 @@
         "shop/beverages": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -10897,6 +11502,7 @@
         "shop/bicycle": {
             "icon": "bicycle",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -10919,6 +11525,7 @@
         "shop/bookmaker": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -10939,6 +11546,7 @@
         "shop/books": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -10959,6 +11567,7 @@
         "shop/boutique": {
             "icon": "shop",
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -10977,6 +11586,7 @@
         "shop/butcher": {
             "icon": "slaughterhouse",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -10997,6 +11607,7 @@
         "shop/candles": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11014,6 +11625,7 @@
         "shop/car_parts": {
             "icon": "car",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11034,6 +11646,7 @@
         "shop/car_repair": {
             "icon": "car",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11057,6 +11670,7 @@
         "shop/car": {
             "icon": "car",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11079,6 +11693,7 @@
         "shop/carpet": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11099,6 +11714,7 @@
         "shop/charity": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11122,6 +11738,7 @@
         "shop/cheese": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11139,6 +11756,7 @@
         "shop/chemist": {
             "icon": "grocery",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11161,6 +11779,7 @@
         "shop/chocolate": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11178,6 +11797,7 @@
         "shop/clothes": {
             "icon": "clothing-store",
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -11196,6 +11816,7 @@
         "shop/coffee": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11213,6 +11834,7 @@
         "shop/computer": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11230,6 +11852,7 @@
         "shop/confectionery": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11247,6 +11870,7 @@
         "shop/convenience": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11264,6 +11888,7 @@
         "shop/copyshop": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11281,6 +11906,7 @@
         "shop/cosmetics": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11298,6 +11924,7 @@
         "shop/craft": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11320,6 +11947,7 @@
         "shop/curtain": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11341,6 +11969,7 @@
         "shop/dairy": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11363,6 +11992,7 @@
         "shop/deli": {
             "icon": "restaurant",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11385,6 +12015,7 @@
         "shop/department_store": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11402,6 +12033,7 @@
         "shop/doityourself": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11419,6 +12051,7 @@
         "shop/dry_cleaning": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11436,6 +12069,7 @@
         "shop/e-cigarette": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11457,6 +12091,7 @@
         "shop/electronics": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11487,6 +12122,7 @@
         "shop/erotic": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11508,6 +12144,7 @@
         "shop/fabric": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11528,6 +12165,7 @@
         "shop/farm": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11549,6 +12187,7 @@
         "shop/fashion": {
             "icon": "shop",
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -11567,6 +12206,7 @@
         "shop/florist": {
             "icon": "florist",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11587,6 +12227,7 @@
         "shop/frame": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11610,6 +12251,7 @@
         "shop/funeral_directors": {
             "icon": "cemetery",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11632,6 +12274,7 @@
         "shop/furnace": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11653,6 +12296,7 @@
         "shop/furniture": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11675,6 +12319,7 @@
         "shop/garden_centre": {
             "icon": "garden-center",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11698,6 +12343,7 @@
         "shop/gas": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11723,6 +12369,7 @@
         "shop/gift": {
             "icon": "gift",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11743,6 +12390,7 @@
         "shop/greengrocer": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11764,6 +12412,7 @@
         "shop/hairdresser": {
             "icon": "hairdresser",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11784,6 +12433,7 @@
         "shop/hardware": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11801,6 +12451,7 @@
         "shop/hearing_aids": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11818,6 +12469,7 @@
         "shop/herbalist": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11835,6 +12487,7 @@
         "shop/hifi": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11856,6 +12509,7 @@
         "shop/houseware": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11877,6 +12531,7 @@
         "shop/interior_decoration": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11894,6 +12549,7 @@
         "shop/jewelry": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11916,6 +12572,7 @@
         "shop/kiosk": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11933,6 +12590,7 @@
         "shop/kitchen": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11950,6 +12608,7 @@
         "shop/laundry": {
             "icon": "laundry",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11967,6 +12626,7 @@
         "shop/leather": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -11984,6 +12644,7 @@
         "shop/locksmith": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12005,6 +12666,7 @@
         "shop/lottery": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12022,6 +12684,7 @@
         "shop/mall": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12042,6 +12705,7 @@
         "shop/massage": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12059,6 +12723,7 @@
         "shop/medical_supply": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12076,6 +12741,7 @@
         "shop/mobile_phone": {
             "icon": "mobile-phone",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12093,6 +12759,7 @@
         "shop/money_lender": {
             "icon": "bank",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12111,6 +12778,7 @@
         "shop/motorcycle": {
             "icon": "scooter",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12131,6 +12799,7 @@
         "shop/music": {
             "icon": "music",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12152,6 +12821,7 @@
         "shop/musical_instrument": {
             "icon": "music",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12172,6 +12842,7 @@
         "shop/newsagent": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12189,6 +12860,7 @@
         "shop/nutrition_supplements": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12206,6 +12878,7 @@
         "shop/optician": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12227,6 +12900,7 @@
         "shop/organic": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12245,6 +12919,7 @@
         "shop/outdoor": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12267,6 +12942,7 @@
         "shop/paint": {
             "icon": "water",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12284,6 +12960,7 @@
         "shop/pastry": {
             "icon": "bakery",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12306,6 +12983,7 @@
         "shop/pawnbroker": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12323,6 +13001,7 @@
         "shop/perfumery": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12340,6 +13019,7 @@
         "shop/pet": {
             "icon": "dog-park",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12366,6 +13046,7 @@
         "shop/photo": {
             "icon": "attraction",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12387,6 +13068,7 @@
         "shop/pyrotechnics": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12404,6 +13086,7 @@
         "shop/radiotechnics": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12421,6 +13104,7 @@
         "shop/religion": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12440,6 +13124,7 @@
         "shop/scuba_diving": {
             "icon": "swimming",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12457,6 +13142,7 @@
         "shop/seafood": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12477,6 +13163,7 @@
         "shop/second_hand": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12502,6 +13189,7 @@
         "shop/shoes": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12519,6 +13207,7 @@
         "shop/sports": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12536,6 +13225,7 @@
         "shop/stationery": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12557,6 +13247,7 @@
         "shop/storage_rental": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building",
@@ -12574,6 +13265,7 @@
         "shop/supermarket": {
             "icon": "grocery",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12596,6 +13288,7 @@
         "shop/tailor": {
             "icon": "clothing-store",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12617,6 +13310,7 @@
         "shop/tattoo": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12634,6 +13328,7 @@
         "shop/tea": {
             "icon": "teahouse",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12651,6 +13346,7 @@
         "shop/ticket": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12668,6 +13364,7 @@
         "shop/tobacco": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12685,6 +13382,7 @@
         "shop/toys": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12702,6 +13400,7 @@
         "shop/travel_agency": {
             "icon": "suitcase",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12719,6 +13418,7 @@
         "shop/tyres": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12736,6 +13436,7 @@
         "shop/vacuum_cleaner": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12753,6 +13454,7 @@
         "shop/variety_store": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12770,6 +13472,7 @@
         "shop/video_games": {
             "icon": "gaming",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12787,6 +13490,7 @@
         "shop/video": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12807,6 +13511,7 @@
         "shop/watches": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12824,6 +13529,7 @@
         "shop/water_sports": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12841,6 +13547,7 @@
         "shop/weapons": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12864,6 +13571,7 @@
         "shop/window_blind": {
             "icon": "shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12881,6 +13589,7 @@
         "shop/wine": {
             "icon": "alcohol-shop",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12898,6 +13607,7 @@
         "tourism": {
             "icon": "attraction",
             "fields": [
+                "name",
                 "tourism"
             ],
             "geometry": [
@@ -12913,6 +13623,7 @@
         "tourism/alpine_hut": {
             "icon": "lodging",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12932,6 +13643,7 @@
         "tourism/apartment": {
             "icon": "lodging",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12953,6 +13665,7 @@
         "tourism/aquarium": {
             "icon": "aquarium",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -12975,6 +13688,7 @@
         "tourism/artwork": {
             "icon": "art-gallery",
             "fields": [
+                "name",
                 "artwork_type",
                 "artist"
             ],
@@ -12996,6 +13710,7 @@
         "tourism/attraction": {
             "icon": "monument",
             "fields": [
+                "name",
                 "operator",
                 "address"
             ],
@@ -13012,6 +13727,7 @@
         "tourism/camp_site": {
             "icon": "campsite",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "capacity",
@@ -13037,6 +13753,7 @@
         "tourism/caravan_site": {
             "icon": "bus",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "capacity",
@@ -13064,6 +13781,7 @@
         "tourism/chalet": {
             "icon": "lodging",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -13084,6 +13802,7 @@
         "tourism/gallery": {
             "icon": "art-gallery",
             "fields": [
+                "name",
                 "artwork_type",
                 "operator",
                 "address",
@@ -13109,6 +13828,7 @@
         "tourism/guest_house": {
             "icon": "lodging",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -13134,6 +13854,7 @@
         "tourism/hostel": {
             "icon": "lodging",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -13155,6 +13876,7 @@
         "tourism/hotel": {
             "icon": "lodging",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -13195,6 +13917,7 @@
         "tourism/information/board": {
             "icon": "information",
             "fields": [
+                "name",
                 "operator",
                 "board_type"
             ],
@@ -13256,6 +13979,7 @@
         "tourism/information/office": {
             "icon": "information",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area"
@@ -13278,6 +14002,7 @@
         "tourism/motel": {
             "icon": "lodging",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -13299,6 +14024,7 @@
         "tourism/museum": {
             "icon": "museum",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -13327,6 +14053,7 @@
         "tourism/picnic_site": {
             "icon": "picnic-site",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "smoking"
@@ -13347,6 +14074,7 @@
         "tourism/theme_park": {
             "icon": "amusement-park",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours"
@@ -13374,6 +14102,7 @@
         "tourism/zoo": {
             "icon": "zoo",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours"
@@ -13607,12 +14336,14 @@
             "name": "Boundary",
             "icon": "boundary",
             "fields": [
+                "name",
                 "boundary"
             ]
         },
         "type/boundary/administrative": {
             "icon": "boundary",
             "fields": [
+                "name",
                 "admin_level"
             ],
             "geometry": [
@@ -13638,6 +14369,7 @@
             "name": "Restriction",
             "icon": "restriction",
             "fields": [
+                "name",
                 "restriction",
                 "except"
             ]
@@ -13750,6 +14482,7 @@
             "name": "Route Master",
             "icon": "route-master",
             "fields": [
+                "name",
                 "route_master",
                 "ref",
                 "operator",
@@ -13766,8 +14499,9 @@
             "name": "Route",
             "icon": "route",
             "fields": [
+                "name",
                 "route",
-                "ref",
+                "ref_route",
                 "operator",
                 "network"
             ]
@@ -13783,7 +14517,8 @@
             "name": "Cycle Route",
             "icon": "route-bicycle",
             "fields": [
-                "ref",
+                "name",
+                "ref_route",
                 "network_bicycle",
                 "cycle_network"
             ]
@@ -13799,7 +14534,8 @@
             "name": "Bus Route",
             "icon": "route-bus",
             "fields": [
-                "ref",
+                "name",
+                "ref_route",
                 "operator",
                 "network"
             ]
@@ -13815,7 +14551,8 @@
             "name": "Detour Route",
             "icon": "route-detour",
             "fields": [
-                "ref"
+                "name",
+                "ref_route"
             ]
         },
         "type/route/ferry": {
@@ -13829,7 +14566,8 @@
             "name": "Ferry Route",
             "icon": "route-ferry",
             "fields": [
-                "ref",
+                "name",
+                "ref_route",
                 "operator",
                 "network"
             ]
@@ -13845,7 +14583,8 @@
             "name": "Foot Route",
             "icon": "route-foot",
             "fields": [
-                "ref",
+                "name",
+                "ref_route",
                 "operator",
                 "network_foot"
             ]
@@ -13861,7 +14600,8 @@
             "name": "Hiking Route",
             "icon": "route-foot",
             "fields": [
-                "ref",
+                "name",
+                "ref_route",
                 "operator",
                 "network_foot"
             ]
@@ -13877,7 +14617,8 @@
             "name": "Riding Route",
             "icon": "route-horse",
             "fields": [
-                "ref",
+                "name",
+                "ref_route",
                 "operator",
                 "network_horse"
             ]
@@ -13893,7 +14634,8 @@
             "name": "Pipeline Route",
             "icon": "route-pipeline",
             "fields": [
-                "ref",
+                "name",
+                "ref_route",
                 "operator"
             ]
         },
@@ -13908,7 +14650,8 @@
             "name": "Power Route",
             "icon": "route-power",
             "fields": [
-                "ref",
+                "name",
+                "ref_route",
                 "operator"
             ]
         },
@@ -13923,7 +14666,8 @@
             "name": "Road Route",
             "icon": "route-road",
             "fields": [
-                "ref",
+                "name",
+                "ref_route",
                 "network_road"
             ]
         },
@@ -13938,7 +14682,8 @@
             "name": "Train Route",
             "icon": "route-train",
             "fields": [
-                "ref",
+                "name",
+                "ref_route",
                 "operator",
                 "network"
             ]
@@ -13954,7 +14699,8 @@
             "name": "Tram Route",
             "icon": "route-tram",
             "fields": [
-                "ref",
+                "name",
+                "ref_route",
                 "operator",
                 "network"
             ]
@@ -13969,12 +14715,16 @@
             "name": "Site",
             "icon": "relation",
             "fields": [
+                "name",
                 "site"
             ]
         },
         "vertex": {
             "name": "Other",
             "tags": {},
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "vertex"
             ],
@@ -13983,6 +14733,7 @@
         "waterway/boatyard": {
             "icon": "harbor",
             "fields": [
+                "name",
                 "operator"
             ],
             "geometry": [
@@ -13998,6 +14749,7 @@
         "waterway/canal": {
             "icon": "waterway-canal",
             "fields": [
+                "name",
                 "width"
             ],
             "geometry": [
@@ -14016,6 +14768,9 @@
                 "line",
                 "area"
             ],
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "waterway": "dam"
             },
@@ -14024,7 +14779,7 @@
         "waterway/ditch": {
             "icon": "waterway-ditch",
             "fields": [
-                "tunnel"
+                "tunnel_waterway"
             ],
             "geometry": [
                 "line"
@@ -14037,6 +14792,7 @@
         "waterway/dock": {
             "icon": "harbor",
             "fields": [
+                "name",
                 "dock",
                 "operator"
             ],
@@ -14059,7 +14815,7 @@
         "waterway/drain": {
             "icon": "waterway-stream",
             "fields": [
-                "tunnel"
+                "tunnel_waterway"
             ],
             "geometry": [
                 "line"
@@ -14072,6 +14828,7 @@
         "waterway/fuel": {
             "icon": "fuel",
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14095,7 +14852,8 @@
         "waterway/river": {
             "icon": "waterway-river",
             "fields": [
-                "tunnel",
+                "name",
+                "tunnel_waterway",
                 "width"
             ],
             "geometry": [
@@ -14134,6 +14892,7 @@
         "waterway/sanitary_dump_station": {
             "icon": "poi-storage-tank",
             "fields": [
+                "name",
                 "operator",
                 "access_toilets",
                 "fee",
@@ -14164,7 +14923,8 @@
         "waterway/stream": {
             "icon": "waterway-stream",
             "fields": [
-                "tunnel",
+                "name",
+                "tunnel_waterway",
                 "width"
             ],
             "geometry": [
@@ -14217,6 +14977,7 @@
         "waterway/waterfall": {
             "icon": "water",
             "fields": [
+                "name",
                 "height",
                 "width"
             ],
@@ -14254,6 +15015,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14273,6 +15035,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14292,6 +15055,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14311,6 +15075,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14330,6 +15095,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14349,6 +15115,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14368,6 +15135,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14387,6 +15155,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14406,6 +15175,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14425,6 +15195,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14444,6 +15215,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14463,6 +15235,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14482,6 +15255,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14501,6 +15275,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14520,6 +15295,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14539,6 +15315,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14558,6 +15335,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14577,6 +15355,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14596,6 +15375,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14615,6 +15395,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14634,6 +15415,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14653,6 +15435,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14672,6 +15455,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14691,6 +15475,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14710,6 +15495,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14729,6 +15515,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14748,6 +15535,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14767,6 +15555,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14786,6 +15575,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14805,6 +15595,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14824,6 +15615,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14843,6 +15635,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14862,6 +15655,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14881,6 +15675,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14900,6 +15695,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14919,6 +15715,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14938,6 +15735,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14957,6 +15755,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14976,6 +15775,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -14995,6 +15795,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15014,6 +15815,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15033,6 +15835,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15052,6 +15855,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15071,6 +15875,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15090,6 +15895,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15109,6 +15915,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15128,6 +15935,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15147,6 +15955,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15166,6 +15975,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15185,6 +15995,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15204,6 +16015,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15223,6 +16035,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15242,6 +16055,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15261,6 +16075,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15280,6 +16095,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15299,6 +16115,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15318,6 +16135,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15337,6 +16155,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15356,6 +16175,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15375,6 +16195,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15394,6 +16215,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15413,6 +16235,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15432,6 +16255,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15451,6 +16275,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15470,6 +16295,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15489,6 +16315,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15508,6 +16335,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15527,6 +16355,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15546,6 +16375,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15565,6 +16395,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15584,6 +16415,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15603,6 +16435,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15622,6 +16455,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15641,6 +16475,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15660,6 +16495,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15679,6 +16515,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15698,6 +16535,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15717,6 +16555,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15736,6 +16575,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15755,6 +16595,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15774,6 +16615,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15793,6 +16635,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15812,6 +16655,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15831,6 +16675,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15850,6 +16695,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15869,6 +16715,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15888,6 +16735,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15907,6 +16755,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15926,6 +16775,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15945,6 +16795,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15964,6 +16815,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -15983,6 +16835,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16002,6 +16855,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16021,6 +16875,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16040,6 +16895,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16059,6 +16915,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16078,6 +16935,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16097,6 +16955,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16116,6 +16975,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16135,6 +16995,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16154,6 +17015,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16173,6 +17035,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16192,6 +17055,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16211,6 +17075,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16230,6 +17095,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16249,6 +17115,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16268,6 +17135,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16287,6 +17155,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16306,6 +17175,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16325,6 +17195,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16344,6 +17215,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16363,6 +17235,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16382,6 +17255,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16401,6 +17275,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16420,6 +17295,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16439,6 +17315,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16458,6 +17335,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16477,6 +17355,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16496,6 +17375,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16515,6 +17395,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16534,6 +17415,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16553,6 +17435,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16572,6 +17455,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16591,6 +17475,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16610,6 +17495,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16629,6 +17515,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16648,6 +17535,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16667,6 +17555,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16686,6 +17575,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16705,6 +17595,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16724,6 +17615,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16743,6 +17635,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16762,6 +17655,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16781,6 +17675,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16800,6 +17695,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16819,6 +17715,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16838,6 +17735,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16857,6 +17755,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16876,6 +17775,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16896,6 +17796,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16915,6 +17816,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16934,6 +17836,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16953,6 +17856,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16972,6 +17876,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -16991,6 +17896,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17010,6 +17916,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17029,6 +17936,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17048,6 +17956,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17067,6 +17976,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17086,6 +17996,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17105,6 +18016,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17124,6 +18036,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17143,6 +18056,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17162,6 +18076,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17181,6 +18096,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17200,6 +18116,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17219,6 +18136,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17238,6 +18156,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17257,6 +18176,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17276,6 +18196,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17295,6 +18216,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17314,6 +18236,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17333,6 +18256,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17352,6 +18276,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17371,6 +18296,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17390,6 +18316,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17409,6 +18336,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17428,6 +18356,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17447,6 +18376,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "opening_hours",
@@ -17466,6 +18396,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17486,6 +18417,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17506,6 +18438,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17526,6 +18459,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17546,6 +18480,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17566,6 +18501,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17586,6 +18522,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17606,6 +18543,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17626,6 +18564,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17646,6 +18585,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17666,6 +18606,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17686,6 +18627,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17706,6 +18648,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17726,6 +18669,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17746,6 +18690,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17766,6 +18711,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17786,6 +18732,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17806,6 +18753,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17826,6 +18774,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17846,6 +18795,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17866,6 +18816,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17886,6 +18837,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17906,6 +18858,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17926,6 +18879,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17946,6 +18900,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17966,6 +18921,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -17986,6 +18942,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -18006,6 +18963,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -18026,6 +18984,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -18046,6 +19005,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -18066,6 +19026,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -18086,6 +19047,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -18106,6 +19068,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -18126,6 +19089,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -18146,6 +19110,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -18166,6 +19131,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -18186,6 +19152,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -18206,6 +19173,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -18226,6 +19194,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -18246,6 +19215,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -18266,6 +19236,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -18286,6 +19257,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -18306,6 +19278,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -18326,6 +19299,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -18346,6 +19320,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "address",
                 "building_area",
                 "opening_hours",
@@ -18366,6 +19341,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18392,6 +19368,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18418,6 +19395,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18444,6 +19422,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18469,6 +19448,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18495,6 +19475,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18520,6 +19501,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18546,6 +19528,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18572,6 +19555,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18597,6 +19581,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18622,6 +19607,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18647,6 +19633,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18672,6 +19659,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18698,6 +19686,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18723,6 +19712,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18748,6 +19738,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18774,6 +19765,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18799,6 +19791,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18824,6 +19817,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18849,6 +19843,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18874,6 +19869,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18899,6 +19895,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18924,6 +19921,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18949,6 +19947,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18974,6 +19973,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -18999,6 +19999,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19025,6 +20026,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19050,6 +20052,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19075,6 +20078,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19100,6 +20104,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19125,6 +20130,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19150,6 +20156,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19176,6 +20183,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19202,6 +20210,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19227,6 +20236,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19253,6 +20263,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19279,6 +20290,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19304,6 +20316,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19330,6 +20343,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19355,6 +20369,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19380,6 +20395,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19406,6 +20422,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19431,6 +20448,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19457,6 +20475,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19484,6 +20503,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19509,6 +20529,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19534,6 +20555,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19559,6 +20581,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19584,6 +20607,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19609,6 +20633,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19636,6 +20661,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19661,6 +20687,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19686,6 +20713,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19712,6 +20740,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19737,6 +20766,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19762,6 +20792,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19787,6 +20818,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19812,6 +20844,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19837,6 +20870,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19863,6 +20897,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19889,6 +20924,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19914,6 +20950,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19939,6 +20976,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19964,6 +21002,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -19989,6 +21028,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -20014,6 +21054,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -20039,6 +21080,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -20065,6 +21107,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -20090,6 +21133,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -20115,6 +21159,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -20140,6 +21185,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -20166,6 +21212,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -20192,6 +21239,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -20217,6 +21265,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -20242,6 +21291,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "operator",
                 "address",
@@ -20268,6 +21318,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20292,6 +21343,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20316,6 +21368,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20340,6 +21393,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20364,6 +21418,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20388,6 +21443,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20412,6 +21468,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20436,6 +21493,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20460,6 +21518,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20484,6 +21543,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20508,6 +21568,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20532,6 +21593,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20556,6 +21618,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20580,6 +21643,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20604,6 +21668,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20628,6 +21693,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20652,6 +21718,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20676,6 +21743,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20700,6 +21768,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20724,6 +21793,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20748,6 +21818,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20772,6 +21843,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20796,6 +21868,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20820,6 +21893,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20844,6 +21918,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20868,6 +21943,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20892,6 +21968,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20916,6 +21993,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20940,6 +22018,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20964,6 +22043,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -20988,6 +22068,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21012,6 +22093,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21036,6 +22118,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21060,6 +22143,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21084,6 +22168,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21108,6 +22193,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21132,6 +22218,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21156,6 +22243,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21180,6 +22268,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21204,6 +22293,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21228,6 +22318,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21252,6 +22343,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21276,6 +22368,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21300,6 +22393,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21324,6 +22418,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21348,6 +22443,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21372,6 +22468,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21396,6 +22493,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21420,6 +22518,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21444,6 +22543,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21468,6 +22568,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21492,6 +22593,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21516,6 +22618,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21540,6 +22643,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21564,6 +22668,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21588,6 +22693,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21612,6 +22718,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21636,6 +22743,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21660,6 +22768,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21684,6 +22793,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21708,6 +22818,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21732,6 +22843,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21756,6 +22868,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21780,6 +22893,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21804,6 +22918,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21828,6 +22943,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21852,6 +22968,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21876,6 +22993,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21900,6 +23018,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21924,6 +23043,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21948,6 +23068,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21972,6 +23093,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -21996,6 +23118,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22020,6 +23143,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22044,6 +23168,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22068,6 +23193,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22092,6 +23218,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22116,6 +23243,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22140,6 +23268,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22164,6 +23293,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22188,6 +23318,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22212,6 +23343,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22236,6 +23368,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22260,6 +23393,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22284,6 +23418,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22308,6 +23443,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22332,6 +23468,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22356,6 +23493,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22380,6 +23518,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22404,6 +23543,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22428,6 +23568,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22452,6 +23593,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22476,6 +23618,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22500,6 +23643,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22524,6 +23668,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22548,6 +23693,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22572,6 +23718,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22596,6 +23743,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22620,6 +23768,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22644,6 +23793,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22668,6 +23818,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22692,6 +23843,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22716,6 +23868,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22741,6 +23894,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22765,6 +23919,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22789,6 +23944,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22813,6 +23969,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22837,6 +23994,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22861,6 +24019,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22885,6 +24044,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22909,6 +24069,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22933,6 +24094,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22957,6 +24119,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -22981,6 +24144,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -23005,6 +24169,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -23029,6 +24194,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -23053,6 +24219,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -23077,6 +24244,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -23101,6 +24269,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -23125,6 +24294,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -23149,6 +24319,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -23173,6 +24344,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -23197,6 +24369,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -23221,6 +24394,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -23245,6 +24419,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -23269,6 +24444,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23290,6 +24466,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23311,6 +24488,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23332,6 +24510,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23353,6 +24532,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23374,6 +24554,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23395,6 +24576,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23416,6 +24598,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23437,6 +24620,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23458,6 +24642,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23479,6 +24664,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23500,6 +24686,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23521,6 +24708,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23542,6 +24730,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23563,6 +24752,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23584,6 +24774,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23605,6 +24796,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23626,6 +24818,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23647,6 +24840,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23668,6 +24862,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23689,6 +24884,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23710,6 +24906,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23731,6 +24928,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23752,6 +24950,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23773,6 +24972,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23794,6 +24994,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23815,6 +25016,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23836,6 +25038,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23857,6 +25060,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23878,6 +25082,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23899,6 +25104,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23920,6 +25126,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23941,6 +25148,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23962,6 +25170,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -23983,6 +25192,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24004,6 +25214,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24025,6 +25236,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24046,6 +25258,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24067,6 +25280,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24088,6 +25302,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24109,6 +25324,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24130,6 +25346,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24151,6 +25368,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24172,6 +25390,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24193,6 +25412,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24214,6 +25434,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24235,6 +25456,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24256,6 +25478,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24277,6 +25500,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24298,6 +25522,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24319,6 +25544,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24340,6 +25566,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24361,6 +25588,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24382,6 +25610,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24403,6 +25632,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24424,6 +25654,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24445,6 +25676,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24466,6 +25698,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24487,6 +25720,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24508,6 +25742,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24529,6 +25764,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24550,6 +25786,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24571,6 +25808,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24592,6 +25830,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24613,6 +25852,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24634,6 +25874,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24655,6 +25896,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24676,6 +25918,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24697,6 +25940,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24718,6 +25962,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24739,6 +25984,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24760,6 +26006,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24781,6 +26028,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24802,6 +26050,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24823,6 +26072,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24844,6 +26094,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24865,6 +26116,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24886,6 +26138,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24907,6 +26160,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24928,6 +26182,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24949,6 +26204,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24970,6 +26226,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -24991,6 +26248,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25012,6 +26270,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25033,6 +26292,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25054,6 +26314,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25075,6 +26336,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25096,6 +26358,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25117,6 +26380,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25138,6 +26402,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25159,6 +26424,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25180,6 +26446,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25201,6 +26468,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25222,6 +26490,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25243,6 +26512,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25264,6 +26534,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25285,6 +26556,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25306,6 +26578,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25327,6 +26600,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25348,6 +26622,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25369,6 +26644,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25390,6 +26666,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25411,6 +26688,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25432,6 +26710,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25453,6 +26732,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25474,6 +26754,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25495,6 +26776,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25516,6 +26798,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25537,6 +26820,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25558,6 +26842,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25579,6 +26864,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25600,6 +26886,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25621,6 +26908,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25642,6 +26930,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25663,6 +26952,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25684,6 +26974,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25705,6 +26996,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25726,6 +27018,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25747,6 +27040,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25768,6 +27062,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25789,6 +27084,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25810,6 +27106,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25831,6 +27128,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25852,6 +27150,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25873,6 +27172,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25894,6 +27194,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25915,6 +27216,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25936,6 +27238,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25957,6 +27260,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25978,6 +27282,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -25999,6 +27304,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26020,6 +27326,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26041,6 +27348,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26062,6 +27370,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26083,6 +27392,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26104,6 +27414,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26125,6 +27436,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26146,6 +27458,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26167,6 +27480,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26188,6 +27502,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26209,6 +27524,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26230,6 +27546,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26251,6 +27568,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26272,6 +27590,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26293,6 +27612,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26314,6 +27634,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26335,6 +27656,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26356,6 +27678,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26377,6 +27700,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26398,6 +27722,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26419,6 +27744,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26440,6 +27766,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26461,6 +27788,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26482,6 +27810,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26503,6 +27832,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26524,6 +27854,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26545,6 +27876,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26566,6 +27898,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26587,6 +27920,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26608,6 +27942,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26629,6 +27964,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26650,6 +27986,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26671,6 +28008,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26692,6 +28030,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26713,6 +28052,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26734,6 +28074,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26755,6 +28096,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26776,6 +28118,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26797,6 +28140,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26818,6 +28162,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26839,6 +28184,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26860,6 +28206,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26881,6 +28228,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26902,6 +28250,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26923,6 +28272,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26944,6 +28294,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26965,6 +28316,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -26986,6 +28338,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27007,6 +28360,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27028,6 +28382,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27049,6 +28404,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27070,6 +28426,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27091,6 +28448,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27112,6 +28470,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27133,6 +28492,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27154,6 +28514,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27175,6 +28536,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27196,6 +28558,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27217,6 +28580,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27238,6 +28602,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27259,6 +28624,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27280,6 +28646,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27301,6 +28668,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27322,6 +28690,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27343,6 +28712,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27364,6 +28734,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27385,6 +28756,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27406,6 +28778,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27427,6 +28800,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27448,6 +28822,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27469,6 +28844,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27490,6 +28866,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27511,6 +28888,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27532,6 +28910,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27553,6 +28932,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27574,6 +28954,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27595,6 +28976,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27616,6 +28998,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27637,6 +29020,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27658,6 +29042,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27679,6 +29064,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27700,6 +29086,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27722,6 +29109,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27744,6 +29132,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27766,6 +29155,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27788,6 +29178,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27810,6 +29201,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27831,6 +29223,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27852,6 +29245,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27873,6 +29267,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27894,6 +29289,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27915,6 +29311,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27936,6 +29333,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27957,6 +29355,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -27979,6 +29378,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28000,6 +29400,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28021,6 +29422,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28042,6 +29444,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28063,6 +29466,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28084,6 +29488,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28105,6 +29510,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28126,6 +29532,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28147,6 +29554,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28168,6 +29576,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28189,6 +29598,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28210,6 +29620,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28231,6 +29642,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28252,6 +29664,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28273,6 +29686,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28294,6 +29708,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28315,6 +29730,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28336,6 +29752,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28357,6 +29774,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28378,6 +29796,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28400,6 +29819,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28421,6 +29841,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28442,6 +29863,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28463,6 +29885,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28484,6 +29907,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28505,6 +29929,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28526,6 +29951,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28547,6 +29973,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "atm",
                 "operator",
                 "address",
@@ -28568,6 +29995,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator"
             ],
             "suggestion": true
@@ -28584,6 +30012,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator"
             ],
             "suggestion": true
@@ -28600,6 +30029,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator"
             ],
             "suggestion": true
@@ -28616,6 +30046,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator"
             ],
             "suggestion": true
@@ -28632,6 +30063,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator"
             ],
             "suggestion": true
@@ -28648,6 +30080,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator"
             ],
             "suggestion": true
@@ -28664,6 +30097,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator"
             ],
             "suggestion": true
@@ -28680,6 +30114,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -28700,6 +30135,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -28720,6 +30156,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -28740,6 +30177,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -28760,6 +30198,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -28780,6 +30219,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -28800,6 +30240,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -28820,6 +30261,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -28840,6 +30282,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -28860,6 +30303,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -28880,6 +30324,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -28900,6 +30345,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -28920,6 +30366,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -28940,6 +30387,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -28960,6 +30408,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -28980,6 +30429,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29000,6 +30450,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29020,6 +30471,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29040,6 +30492,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29060,6 +30513,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29080,6 +30534,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29100,6 +30555,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29120,6 +30576,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29140,6 +30597,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29160,6 +30618,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29180,6 +30639,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29200,6 +30660,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29220,6 +30681,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29240,6 +30702,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29260,6 +30723,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29280,6 +30744,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29300,6 +30765,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29320,6 +30786,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29340,6 +30807,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29360,6 +30828,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29380,6 +30849,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29400,6 +30870,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29420,6 +30891,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29440,6 +30912,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29460,6 +30933,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29480,6 +30954,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29500,6 +30975,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29520,6 +30996,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29540,6 +31017,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29560,6 +31038,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29580,6 +31059,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29600,6 +31080,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29620,6 +31101,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29640,6 +31122,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29660,6 +31143,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29680,6 +31164,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29700,6 +31185,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29720,6 +31206,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29740,6 +31227,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29760,6 +31248,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29780,6 +31269,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29800,6 +31290,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29820,6 +31311,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29840,6 +31332,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29860,6 +31353,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29880,6 +31374,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29900,6 +31395,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29920,6 +31416,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29940,6 +31437,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29960,6 +31458,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -29980,6 +31479,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -30000,6 +31500,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -30020,6 +31521,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -30040,6 +31542,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -30060,6 +31563,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -30080,6 +31584,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -30100,6 +31605,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -30120,6 +31626,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -30140,6 +31647,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -30161,6 +31669,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30185,6 +31694,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30209,6 +31719,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30233,6 +31744,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30257,6 +31769,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30281,6 +31794,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30305,6 +31819,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30330,6 +31845,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30354,6 +31870,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30378,6 +31895,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30402,6 +31920,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30426,6 +31945,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30450,6 +31970,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30475,6 +31996,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30499,6 +32021,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30523,6 +32046,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30547,6 +32071,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30572,6 +32097,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30596,6 +32122,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30620,6 +32147,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30644,6 +32172,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30668,6 +32197,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30692,6 +32222,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30716,6 +32247,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30740,6 +32272,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30765,6 +32298,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30789,6 +32323,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "cuisine",
                 "address",
                 "building_area",
@@ -30813,6 +32348,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -30832,6 +32368,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -30851,6 +32388,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -30870,6 +32408,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -30889,6 +32428,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -30908,6 +32448,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -30927,6 +32468,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -30946,6 +32488,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -30965,6 +32508,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -30984,6 +32528,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31003,6 +32548,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31022,6 +32568,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31041,6 +32588,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31060,6 +32608,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31079,6 +32628,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31098,6 +32648,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31117,6 +32668,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31136,6 +32688,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31155,6 +32708,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31174,6 +32728,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31193,6 +32748,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31212,6 +32768,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31231,6 +32788,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31250,6 +32808,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31269,6 +32828,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31288,6 +32848,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31307,6 +32868,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31326,6 +32888,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31345,6 +32908,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31364,6 +32928,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31383,6 +32948,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31402,6 +32968,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31421,6 +32988,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31440,6 +33008,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31459,6 +33028,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31478,6 +33048,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31497,6 +33068,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31516,6 +33088,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31535,6 +33108,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31554,6 +33128,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31573,6 +33148,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31592,6 +33168,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31611,6 +33188,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31630,6 +33208,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31649,6 +33228,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31668,6 +33248,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31687,6 +33268,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31706,6 +33288,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31725,6 +33308,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31744,6 +33328,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31763,6 +33348,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31782,6 +33368,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31801,6 +33388,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31820,6 +33408,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31839,6 +33428,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31858,6 +33448,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31877,6 +33468,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31896,6 +33488,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31915,6 +33508,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31934,6 +33528,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31953,6 +33548,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31972,6 +33568,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -31991,6 +33588,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32010,6 +33608,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32029,6 +33628,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32048,6 +33648,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32067,6 +33668,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32086,6 +33688,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32105,6 +33708,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32124,6 +33728,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32143,6 +33748,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32162,6 +33768,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32181,6 +33788,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32200,6 +33808,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32219,6 +33828,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32238,6 +33848,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32257,6 +33868,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32276,6 +33888,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32295,6 +33908,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32314,6 +33928,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32333,6 +33948,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32352,6 +33968,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32371,6 +33988,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32390,6 +34008,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32409,6 +34028,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32428,6 +34048,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32447,6 +34068,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32466,6 +34088,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32485,6 +34108,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32504,6 +34128,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32523,6 +34148,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32542,6 +34168,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32561,6 +34188,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32580,6 +34208,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32599,6 +34228,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32618,6 +34248,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32637,6 +34268,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32656,6 +34288,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32675,6 +34308,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32694,6 +34328,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32713,6 +34348,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32732,6 +34368,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32751,6 +34388,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32770,6 +34408,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32789,6 +34428,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32808,6 +34448,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32827,6 +34468,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32846,6 +34488,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32865,6 +34508,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32884,6 +34528,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32903,6 +34548,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32922,6 +34568,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32941,6 +34588,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32960,6 +34608,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32979,6 +34628,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -32998,6 +34648,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33017,6 +34668,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33036,6 +34688,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33055,6 +34708,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33074,6 +34728,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33093,6 +34748,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33112,6 +34768,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33131,6 +34788,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33150,6 +34808,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33169,6 +34828,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33188,6 +34848,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33207,6 +34868,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33226,6 +34888,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33245,6 +34908,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33264,6 +34928,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33283,6 +34948,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33302,6 +34968,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33321,6 +34988,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33340,6 +35008,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33359,6 +35028,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33378,6 +35048,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33397,6 +35068,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33416,6 +35088,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33435,6 +35108,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33454,6 +35128,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33473,6 +35148,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33492,6 +35168,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33511,6 +35188,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33530,6 +35208,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33549,6 +35228,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33568,6 +35248,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33587,6 +35268,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33606,6 +35288,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33625,6 +35308,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33644,6 +35328,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33663,6 +35348,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33682,6 +35368,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33701,6 +35388,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33720,6 +35408,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33739,6 +35428,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33758,6 +35448,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33777,6 +35468,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33796,6 +35488,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33815,6 +35508,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33834,6 +35528,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33853,6 +35548,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33872,6 +35568,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33891,6 +35588,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33910,6 +35608,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33929,6 +35628,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33948,6 +35648,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33967,6 +35668,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -33986,6 +35688,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34005,6 +35708,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34024,6 +35728,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34043,6 +35748,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34062,6 +35768,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34081,6 +35788,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34100,6 +35808,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34119,6 +35828,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34138,6 +35848,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34157,6 +35868,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34176,6 +35888,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34195,6 +35908,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34214,6 +35928,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34233,6 +35948,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34252,6 +35968,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34271,6 +35988,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34290,6 +36008,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34309,6 +36028,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34328,6 +36048,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34347,6 +36068,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34366,6 +36088,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34385,6 +36108,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34404,6 +36128,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34423,6 +36148,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34442,6 +36168,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34461,6 +36188,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34480,6 +36208,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34499,6 +36228,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34518,6 +36248,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34537,6 +36268,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34556,6 +36288,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34575,6 +36308,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34594,6 +36328,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34613,6 +36348,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34632,6 +36368,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34651,6 +36388,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34670,6 +36408,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34689,6 +36428,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34708,6 +36448,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34727,6 +36468,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34746,6 +36488,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34765,6 +36508,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34784,6 +36528,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34803,6 +36548,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34822,6 +36568,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34841,6 +36588,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34860,6 +36608,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34879,6 +36628,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34898,6 +36648,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34917,6 +36668,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34936,6 +36688,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34955,6 +36708,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34974,6 +36728,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -34993,6 +36748,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35012,6 +36768,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35031,6 +36788,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35050,6 +36808,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35069,6 +36828,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35088,6 +36848,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35107,6 +36868,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35126,6 +36888,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35145,6 +36908,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35164,6 +36928,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35183,6 +36948,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35202,6 +36968,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35221,6 +36988,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35240,6 +37008,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35259,6 +37028,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35278,6 +37048,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35297,6 +37068,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35316,6 +37088,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35335,6 +37108,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35354,6 +37128,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35373,6 +37148,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35392,6 +37168,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35411,6 +37188,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35430,6 +37208,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35449,6 +37228,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35468,6 +37248,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35487,6 +37268,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35506,6 +37288,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35525,6 +37308,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35544,6 +37328,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35563,6 +37348,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35582,6 +37368,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35601,6 +37388,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35620,6 +37408,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35640,6 +37429,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35660,6 +37450,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35679,6 +37470,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35698,6 +37490,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35717,6 +37510,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35736,6 +37530,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35755,6 +37550,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35774,6 +37570,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35793,6 +37590,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35812,6 +37610,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35831,6 +37630,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35850,6 +37650,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35869,6 +37670,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35888,6 +37690,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35907,6 +37710,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35927,6 +37731,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35947,6 +37752,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35966,6 +37772,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -35985,6 +37792,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36004,6 +37812,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36023,6 +37832,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36042,6 +37852,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36061,6 +37872,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36081,6 +37893,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36100,6 +37913,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36119,6 +37933,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36138,6 +37953,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36157,6 +37973,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36176,6 +37993,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36195,6 +38013,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36215,6 +38034,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36234,6 +38054,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36253,6 +38074,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36272,6 +38094,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36291,6 +38114,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36310,6 +38134,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36329,6 +38154,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36348,6 +38174,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36367,6 +38194,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36386,6 +38214,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36405,6 +38234,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36424,6 +38254,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36443,6 +38274,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36462,6 +38294,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36481,6 +38314,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36500,6 +38334,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36519,6 +38354,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36538,6 +38374,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36557,6 +38394,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36576,6 +38414,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36595,6 +38434,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36614,6 +38454,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36633,6 +38474,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36652,6 +38494,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36671,6 +38514,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36690,6 +38534,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36709,6 +38554,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36728,6 +38574,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36747,6 +38594,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36766,6 +38614,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36785,6 +38634,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36804,6 +38654,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36823,6 +38674,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36842,6 +38694,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36861,6 +38714,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36880,6 +38734,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36899,6 +38754,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36918,6 +38774,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36937,6 +38794,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36956,6 +38814,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36975,6 +38834,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -36994,6 +38854,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37013,6 +38874,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37032,6 +38894,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37051,6 +38914,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37070,6 +38934,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37089,6 +38954,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37108,6 +38974,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37127,6 +38994,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37146,6 +39014,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37165,6 +39034,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37184,6 +39054,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37203,6 +39074,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37222,6 +39094,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37241,6 +39114,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37260,6 +39134,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37279,6 +39154,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37298,6 +39174,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37317,6 +39194,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37336,6 +39214,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37355,6 +39234,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37374,6 +39254,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37393,6 +39274,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37412,6 +39294,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37431,6 +39314,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37450,6 +39334,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37469,6 +39354,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37488,6 +39374,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37507,6 +39394,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37526,6 +39414,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37545,6 +39434,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37565,6 +39455,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37585,6 +39476,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37605,6 +39497,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37625,6 +39518,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37645,6 +39539,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37665,6 +39560,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37685,6 +39581,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37705,6 +39602,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37725,6 +39623,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37745,6 +39644,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37765,6 +39665,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37785,6 +39686,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37805,6 +39707,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37825,6 +39728,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37845,6 +39749,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37865,6 +39770,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37885,6 +39791,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37905,6 +39812,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37924,6 +39832,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37943,6 +39852,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37962,6 +39872,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -37981,6 +39892,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38000,6 +39912,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38019,6 +39932,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38038,6 +39952,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38057,6 +39972,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38076,6 +39992,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38095,6 +40012,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38114,6 +40032,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38133,6 +40052,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38152,6 +40072,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38171,6 +40092,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38190,6 +40112,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38209,6 +40132,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38228,6 +40152,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38247,6 +40172,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38266,6 +40192,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38285,6 +40212,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38304,6 +40232,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38323,6 +40252,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38342,6 +40272,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38361,6 +40292,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38380,6 +40312,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38399,6 +40332,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38418,6 +40352,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38437,6 +40372,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38456,6 +40392,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38475,6 +40412,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38494,6 +40432,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38513,6 +40452,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38532,6 +40472,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38551,6 +40492,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38570,6 +40512,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38589,6 +40532,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38608,6 +40552,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38627,6 +40572,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38646,6 +40592,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38665,6 +40612,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38684,6 +40632,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38703,6 +40652,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38722,6 +40672,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38741,6 +40692,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38760,6 +40712,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38779,6 +40732,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38800,6 +40754,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38821,6 +40776,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38842,6 +40798,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38863,6 +40820,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38884,6 +40842,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38905,6 +40864,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38926,6 +40886,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38947,6 +40908,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38968,6 +40930,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -38989,6 +40952,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -39010,6 +40974,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -39031,6 +40996,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -39052,6 +41018,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -39073,6 +41040,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -39094,6 +41062,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -39115,6 +41084,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -39136,6 +41106,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -39157,6 +41128,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -39178,6 +41150,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -39199,6 +41172,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -39220,6 +41194,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -39241,6 +41216,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -39262,6 +41238,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39282,6 +41259,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39302,6 +41280,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39322,6 +41301,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39342,6 +41322,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39362,6 +41343,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39382,6 +41364,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39402,6 +41385,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39422,6 +41406,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39442,6 +41427,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39462,6 +41448,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39482,6 +41469,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39502,6 +41490,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39522,6 +41511,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39542,6 +41532,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39562,6 +41553,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39582,6 +41574,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39602,6 +41595,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39622,6 +41616,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39642,6 +41637,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39662,6 +41658,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39682,6 +41679,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39702,6 +41700,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39722,6 +41721,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39742,6 +41742,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39762,6 +41763,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39782,6 +41784,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39802,6 +41805,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39822,6 +41826,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39842,6 +41847,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39862,6 +41868,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39882,6 +41889,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39902,6 +41910,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39922,6 +41931,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39942,6 +41952,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39962,6 +41973,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -39982,6 +41994,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40002,6 +42015,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40022,6 +42036,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40042,6 +42057,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40062,6 +42078,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40082,6 +42099,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40102,6 +42120,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40122,6 +42141,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40142,6 +42162,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40162,6 +42183,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40182,6 +42204,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40202,6 +42225,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40222,6 +42246,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40242,6 +42267,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40262,6 +42288,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40282,6 +42309,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40302,6 +42330,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40322,6 +42351,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40342,6 +42372,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40362,6 +42393,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40382,6 +42414,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40402,6 +42435,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40422,6 +42456,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40442,6 +42477,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40462,6 +42498,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40482,6 +42519,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40502,6 +42540,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40522,6 +42561,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40542,6 +42582,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40562,6 +42603,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40582,6 +42624,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40602,6 +42645,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40622,6 +42666,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40642,6 +42687,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40662,6 +42708,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40682,6 +42729,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40702,6 +42750,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40722,6 +42771,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "clothes",
                 "operator",
                 "address",
@@ -40742,6 +42792,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -40764,6 +42815,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -40786,6 +42838,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -40808,6 +42861,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -40830,6 +42884,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -40852,6 +42907,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -40874,6 +42930,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -40896,6 +42953,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -40915,6 +42973,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -40934,6 +42993,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -40953,6 +43013,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -40972,6 +43033,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -40991,6 +43053,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41010,6 +43073,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41029,6 +43093,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41048,6 +43113,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41067,6 +43133,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41086,6 +43153,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41105,6 +43173,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41124,6 +43193,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41143,6 +43213,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41163,6 +43234,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41183,6 +43255,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41203,6 +43276,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41223,6 +43297,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41243,6 +43318,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41263,6 +43339,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41283,6 +43360,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41303,6 +43381,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41323,6 +43402,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41343,6 +43423,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41363,6 +43444,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41383,6 +43465,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41402,6 +43485,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41421,6 +43505,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41440,6 +43525,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41459,6 +43545,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41478,6 +43565,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41497,6 +43585,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41516,6 +43605,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41535,6 +43625,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41554,6 +43645,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41573,6 +43665,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41592,6 +43685,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41611,6 +43705,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41630,6 +43725,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41649,6 +43745,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41668,6 +43765,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41687,6 +43785,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41706,6 +43805,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41725,6 +43825,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41744,6 +43845,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41763,6 +43865,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41782,6 +43885,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41801,6 +43905,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41820,6 +43925,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41839,6 +43945,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41858,6 +43965,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41877,6 +43985,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41896,6 +44005,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41915,6 +44025,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41934,6 +44045,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41953,6 +44065,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41972,6 +44085,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -41991,6 +44105,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42010,6 +44125,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42029,6 +44145,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42048,6 +44165,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42067,6 +44185,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42086,6 +44205,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42105,6 +44225,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42124,6 +44245,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42143,6 +44265,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42162,6 +44285,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42181,6 +44305,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42200,6 +44325,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42219,6 +44345,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42238,6 +44365,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42257,6 +44385,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42276,6 +44405,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42295,6 +44425,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42314,6 +44445,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42333,6 +44465,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42352,6 +44485,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42371,6 +44505,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42390,6 +44525,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42409,6 +44545,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42428,6 +44565,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42447,6 +44585,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42466,6 +44605,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42485,6 +44625,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42504,6 +44645,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42523,6 +44665,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42542,6 +44685,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42561,6 +44705,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42580,6 +44725,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42599,6 +44745,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42618,6 +44765,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42637,6 +44785,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42656,6 +44805,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42675,6 +44825,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42694,6 +44845,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42713,6 +44865,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42732,6 +44885,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42751,6 +44905,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42770,6 +44925,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42789,6 +44945,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42808,6 +44965,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42827,6 +44985,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42846,6 +45005,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42865,6 +45025,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42884,6 +45045,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42903,6 +45065,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42922,6 +45085,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42941,6 +45105,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42960,6 +45125,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42979,6 +45145,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -42998,6 +45165,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43017,6 +45185,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43036,6 +45205,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43055,6 +45225,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43074,6 +45245,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43093,6 +45265,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43112,6 +45285,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43131,6 +45305,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43150,6 +45325,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43169,6 +45345,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43188,6 +45365,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43207,6 +45385,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43226,6 +45405,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43245,6 +45425,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43264,6 +45445,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43283,6 +45465,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43302,6 +45485,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43321,6 +45505,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43340,6 +45525,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43359,6 +45545,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43378,6 +45565,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43397,6 +45585,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43416,6 +45605,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43435,6 +45625,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43454,6 +45645,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43473,6 +45665,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43492,6 +45685,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43511,6 +45705,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
@@ -43530,6 +45725,7 @@
                 "area"
             ],
             "fields": [
+                "name",
                 "operator",
                 "address",
                 "building_area",
diff --git a/data/presets/presets/_highway.json b/data/presets/presets/_highway.json
index ffbe8d986..31827c249 100644
--- a/data/presets/presets/_highway.json
+++ b/data/presets/presets/_highway.json
@@ -1,5 +1,6 @@
 {
     "fields": [
+        "name",
         "highway"
     ],
     "geometry": [
diff --git a/data/presets/presets/_place.json b/data/presets/presets/_place.json
index b0ba0e209..77e7609c3 100644
--- a/data/presets/presets/_place.json
+++ b/data/presets/presets/_place.json
@@ -1,5 +1,6 @@
 {
     "fields": [
+        "name",
         "place"
     ],
     "geometry": [
diff --git a/data/presets/presets/_roundabout.json b/data/presets/presets/_roundabout.json
index 05916a536..96c99d4e9 100644
--- a/data/presets/presets/_roundabout.json
+++ b/data/presets/presets/_roundabout.json
@@ -3,6 +3,9 @@
         "vertex",
         "line"
     ],
+    "fields": [
+        "name"
+    ],
     "tags": {
         "junction": "roundabout"
     },
diff --git a/data/presets/presets/_waterway.json b/data/presets/presets/_waterway.json
index c7a1b6c29..062508561 100644
--- a/data/presets/presets/_waterway.json
+++ b/data/presets/presets/_waterway.json
@@ -1,5 +1,6 @@
 {
     "fields": [
+        "name",
         "waterway"
     ],
     "geometry": [
diff --git a/data/presets/presets/aerialway/cable_car.json b/data/presets/presets/aerialway/cable_car.json
index 35a6d6333..a64136a89 100644
--- a/data/presets/presets/aerialway/cable_car.json
+++ b/data/presets/presets/aerialway/cable_car.json
@@ -7,6 +7,7 @@
         "ropeway"
     ],
     "fields": [
+        "name",
         "aerialway/occupancy",
         "aerialway/capacity",
         "aerialway/duration",
diff --git a/data/presets/presets/aerialway/chair_lift.json b/data/presets/presets/aerialway/chair_lift.json
index f26cc225b..27d045530 100644
--- a/data/presets/presets/aerialway/chair_lift.json
+++ b/data/presets/presets/aerialway/chair_lift.json
@@ -3,6 +3,7 @@
         "line"
     ],
     "fields": [
+        "name",
         "aerialway/occupancy",
         "aerialway/capacity",
         "aerialway/duration",
diff --git a/data/presets/presets/aerialway/drag_lift.json b/data/presets/presets/aerialway/drag_lift.json
index d10b15c96..6dc4eca5e 100644
--- a/data/presets/presets/aerialway/drag_lift.json
+++ b/data/presets/presets/aerialway/drag_lift.json
@@ -3,6 +3,7 @@
         "line"
     ],
     "fields": [
+        "name",
         "aerialway/capacity",
         "aerialway/duration"
     ],
diff --git a/data/presets/presets/aerialway/gondola.json b/data/presets/presets/aerialway/gondola.json
index c4b41de4e..9f354f5fd 100644
--- a/data/presets/presets/aerialway/gondola.json
+++ b/data/presets/presets/aerialway/gondola.json
@@ -3,6 +3,7 @@
         "line"
     ],
     "fields": [
+        "name",
         "aerialway/occupancy",
         "aerialway/capacity",
         "aerialway/duration",
diff --git a/data/presets/presets/aerialway/goods.json b/data/presets/presets/aerialway/goods.json
index 650ecbefb..9ad3ab629 100644
--- a/data/presets/presets/aerialway/goods.json
+++ b/data/presets/presets/aerialway/goods.json
@@ -3,6 +3,7 @@
         "line"
     ],
     "fields": [
+        "name",
         "aerialway/capacity",
         "aerialway/duration"
     ],
diff --git a/data/presets/presets/aerialway/magic_carpet.json b/data/presets/presets/aerialway/magic_carpet.json
index 9cad4ba7f..f7eecd0ca 100644
--- a/data/presets/presets/aerialway/magic_carpet.json
+++ b/data/presets/presets/aerialway/magic_carpet.json
@@ -3,6 +3,7 @@
         "line"
     ],
     "fields": [
+        "name",
         "aerialway/capacity",
         "aerialway/duration",
         "aerialway/heating"
diff --git a/data/presets/presets/aerialway/mixed_lift.json b/data/presets/presets/aerialway/mixed_lift.json
index d8ddb6417..2cb5143ed 100644
--- a/data/presets/presets/aerialway/mixed_lift.json
+++ b/data/presets/presets/aerialway/mixed_lift.json
@@ -3,6 +3,7 @@
         "line"
     ],
     "fields": [
+      "name",
       "aerialway/occupancy",
       "aerialway/capacity",
       "aerialway/duration",
diff --git a/data/presets/presets/aerialway/platter.json b/data/presets/presets/aerialway/platter.json
index 2add6a3af..3cd9b4f4c 100644
--- a/data/presets/presets/aerialway/platter.json
+++ b/data/presets/presets/aerialway/platter.json
@@ -7,6 +7,7 @@
         "poma lift"
     ],
     "fields": [
+        "name",
         "aerialway/capacity",
         "aerialway/duration"
     ],
diff --git a/data/presets/presets/aerialway/rope_tow.json b/data/presets/presets/aerialway/rope_tow.json
index ed4193634..61db37a00 100644
--- a/data/presets/presets/aerialway/rope_tow.json
+++ b/data/presets/presets/aerialway/rope_tow.json
@@ -7,6 +7,7 @@
         "bugel lift"
     ],
     "fields": [
+        "name",
         "aerialway/capacity",
         "aerialway/duration"
     ],
diff --git a/data/presets/presets/aerialway/station.json b/data/presets/presets/aerialway/station.json
index 19e31c2d9..690a357ae 100644
--- a/data/presets/presets/aerialway/station.json
+++ b/data/presets/presets/aerialway/station.json
@@ -2,12 +2,14 @@
     "icon": "aerialway",
     "geometry": [
         "point",
-        "vertex"
+        "vertex",
+        "area"
     ],
     "fields": [
         "aerialway/access",
         "aerialway/summer/access",
-        "elevation"
+        "elevation",
+        "building_area"
     ],
     "tags": {
         "aerialway": "station"
diff --git a/data/presets/presets/aerialway/t-bar.json b/data/presets/presets/aerialway/t-bar.json
index 5b465adba..7852b99b6 100644
--- a/data/presets/presets/aerialway/t-bar.json
+++ b/data/presets/presets/aerialway/t-bar.json
@@ -3,9 +3,13 @@
         "line"
     ],
     "fields": [
+        "name",
         "aerialway/capacity",
         "aerialway/duration"
     ],
+    "terms": [
+        "tbar"
+    ],
     "tags": {
         "aerialway": "t-bar"
     },
diff --git a/data/presets/presets/aeroway/aerodrome.json b/data/presets/presets/aeroway/aerodrome.json
index 0a9047492..6525b756a 100644
--- a/data/presets/presets/aeroway/aerodrome.json
+++ b/data/presets/presets/aeroway/aerodrome.json
@@ -5,7 +5,7 @@
         "area"
     ],
     "fields": [
-        "ref",
+        "name",
         "iata",
         "icao",
         "operator",
diff --git a/data/presets/presets/aeroway/gate.json b/data/presets/presets/aeroway/gate.json
index 1a1bdb2f3..e0c3f663e 100644
--- a/data/presets/presets/aeroway/gate.json
+++ b/data/presets/presets/aeroway/gate.json
@@ -4,7 +4,7 @@
         "point"
     ],
     "fields": [
-        "ref"
+        "ref_aeroway_gate"
     ],
     "tags": {
         "aeroway": "gate"
diff --git a/data/presets/presets/aeroway/hangar.json b/data/presets/presets/aeroway/hangar.json
index f59425023..5f8c2ae64 100644
--- a/data/presets/presets/aeroway/hangar.json
+++ b/data/presets/presets/aeroway/hangar.json
@@ -3,6 +3,7 @@
         "area"
     ],
     "fields": [
+        "name",
         "building_area"
     ],
     "tags": {
diff --git a/data/presets/presets/aeroway/runway.json b/data/presets/presets/aeroway/runway.json
index 42f9dec3d..34885e219 100644
--- a/data/presets/presets/aeroway/runway.json
+++ b/data/presets/presets/aeroway/runway.json
@@ -7,7 +7,7 @@
         "landing strip"
     ],
     "fields": [
-        "ref",
+        "ref_runway",
         "surface",
         "length",
         "width"
diff --git a/data/presets/presets/aeroway/taxiway.json b/data/presets/presets/aeroway/taxiway.json
index 2f389be5d..3882deaba 100644
--- a/data/presets/presets/aeroway/taxiway.json
+++ b/data/presets/presets/aeroway/taxiway.json
@@ -3,7 +3,7 @@
         "line"
     ],
     "fields": [
-        "ref",
+        "ref_taxiway",
         "surface"
     ],
     "tags": {
diff --git a/data/presets/presets/aeroway/terminal.json b/data/presets/presets/aeroway/terminal.json
index cf83b5dea..f272f8e79 100644
--- a/data/presets/presets/aeroway/terminal.json
+++ b/data/presets/presets/aeroway/terminal.json
@@ -9,6 +9,7 @@
         "aerodrome"
     ],
     "fields": [
+        "name",
         "operator",
         "building_area"
     ],
diff --git a/data/presets/presets/amenity/_coworking_space.json b/data/presets/presets/amenity/_coworking_space.json
index 41a7006ff..b7a911fbf 100644
--- a/data/presets/presets/amenity/_coworking_space.json
+++ b/data/presets/presets/amenity/_coworking_space.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours",
diff --git a/data/presets/presets/amenity/_nursing_home.json b/data/presets/presets/amenity/_nursing_home.json
index 7e77c5554..2694f8d60 100644
--- a/data/presets/presets/amenity/_nursing_home.json
+++ b/data/presets/presets/amenity/_nursing_home.json
@@ -1,6 +1,7 @@
 {
     "icon": "wheelchair",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/amenity/_register_office.json b/data/presets/presets/amenity/_register_office.json
index 205854909..e0ee280af 100644
--- a/data/presets/presets/amenity/_register_office.json
+++ b/data/presets/presets/amenity/_register_office.json
@@ -1,6 +1,7 @@
 {
     "icon": "town-hall",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours",
diff --git a/data/presets/presets/amenity/animal_boarding.json b/data/presets/presets/amenity/animal_boarding.json
index 05958096f..1c1139ddc 100644
--- a/data/presets/presets/amenity/animal_boarding.json
+++ b/data/presets/presets/amenity/animal_boarding.json
@@ -1,6 +1,7 @@
 {
     "icon": "veterinary",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/amenity/animal_breeding.json b/data/presets/presets/amenity/animal_breeding.json
index f1185e1ac..be8362cca 100644
--- a/data/presets/presets/amenity/animal_breeding.json
+++ b/data/presets/presets/amenity/animal_breeding.json
@@ -1,6 +1,7 @@
 {
     "icon": "veterinary",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/amenity/animal_shelter.json b/data/presets/presets/amenity/animal_shelter.json
index 37a0ef55b..a6aa14901 100644
--- a/data/presets/presets/amenity/animal_shelter.json
+++ b/data/presets/presets/amenity/animal_shelter.json
@@ -1,6 +1,7 @@
 {
     "icon": "veterinary",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/amenity/arts_centre.json b/data/presets/presets/amenity/arts_centre.json
index f2a5f35f5..db46da13f 100644
--- a/data/presets/presets/amenity/arts_centre.json
+++ b/data/presets/presets/amenity/arts_centre.json
@@ -1,6 +1,7 @@
 {
     "icon": "theatre",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/amenity/bank.json b/data/presets/presets/amenity/bank.json
index 39ad570ce..cf8f18473 100644
--- a/data/presets/presets/amenity/bank.json
+++ b/data/presets/presets/amenity/bank.json
@@ -1,6 +1,7 @@
 {
     "icon": "bank",
     "fields": [
+	    "name",
         "atm",
         "operator",
         "address",
diff --git a/data/presets/presets/amenity/bar.json b/data/presets/presets/amenity/bar.json
index 7f67888ea..02ca5c24b 100644
--- a/data/presets/presets/amenity/bar.json
+++ b/data/presets/presets/amenity/bar.json
@@ -1,6 +1,7 @@
 {
     "icon": "bar",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/amenity/biergarten.json b/data/presets/presets/amenity/biergarten.json
index d5f2a2e16..334edbaea 100644
--- a/data/presets/presets/amenity/biergarten.json
+++ b/data/presets/presets/amenity/biergarten.json
@@ -1,6 +1,7 @@
 {
     "icon": "beer",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours",
diff --git a/data/presets/presets/amenity/boat_rental.json b/data/presets/presets/amenity/boat_rental.json
index 3787ea97e..64a5b45c6 100644
--- a/data/presets/presets/amenity/boat_rental.json
+++ b/data/presets/presets/amenity/boat_rental.json
@@ -1,5 +1,6 @@
 {
     "fields": [
+        "name",
         "operator"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/bureau_de_change.json b/data/presets/presets/amenity/bureau_de_change.json
index 5048096e4..c59cd7146 100644
--- a/data/presets/presets/amenity/bureau_de_change.json
+++ b/data/presets/presets/amenity/bureau_de_change.json
@@ -1,6 +1,7 @@
 {
     "icon": "bank",
     "fields": [
+        "name",
         "operator",
         "currency_multi"
     ],
diff --git a/data/presets/presets/amenity/bus_station.json b/data/presets/presets/amenity/bus_station.json
index 08218154d..a533f4f6d 100644
--- a/data/presets/presets/amenity/bus_station.json
+++ b/data/presets/presets/amenity/bus_station.json
@@ -1,6 +1,7 @@
 {
     "icon": "bus",
     "fields": [
+        "name",
         "building_area",
         "operator",
         "internet_access",
diff --git a/data/presets/presets/amenity/cafe.json b/data/presets/presets/amenity/cafe.json
index 2c701f062..c645ccb3e 100644
--- a/data/presets/presets/amenity/cafe.json
+++ b/data/presets/presets/amenity/cafe.json
@@ -1,6 +1,7 @@
 {
     "icon": "cafe",
     "fields": [
+        "name",
         "cuisine",
         "address",
         "building_area",
diff --git a/data/presets/presets/amenity/car_rental.json b/data/presets/presets/amenity/car_rental.json
index 0da3d3ea0..dbf1912a2 100644
--- a/data/presets/presets/amenity/car_rental.json
+++ b/data/presets/presets/amenity/car_rental.json
@@ -1,6 +1,7 @@
 {
     "icon": "car",
     "fields": [
+        "name",
         "operator"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/car_sharing.json b/data/presets/presets/amenity/car_sharing.json
index 6316ef9f2..e2aebbbd3 100644
--- a/data/presets/presets/amenity/car_sharing.json
+++ b/data/presets/presets/amenity/car_sharing.json
@@ -1,6 +1,7 @@
 {
     "icon": "car",
     "fields": [
+        "name",
         "operator",
         "capacity"
     ],
diff --git a/data/presets/presets/amenity/casino.json b/data/presets/presets/amenity/casino.json
index c16d20612..ed16cd0fb 100644
--- a/data/presets/presets/amenity/casino.json
+++ b/data/presets/presets/amenity/casino.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-dice",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/amenity/childcare.json b/data/presets/presets/amenity/childcare.json
index a33ec9994..4bc4de581 100644
--- a/data/presets/presets/amenity/childcare.json
+++ b/data/presets/presets/amenity/childcare.json
@@ -1,6 +1,7 @@
 {
     "icon": "school",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/amenity/cinema.json b/data/presets/presets/amenity/cinema.json
index 45357048a..19eca302f 100644
--- a/data/presets/presets/amenity/cinema.json
+++ b/data/presets/presets/amenity/cinema.json
@@ -1,6 +1,7 @@
 {
     "icon": "cinema",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/amenity/clinic.json b/data/presets/presets/amenity/clinic.json
index f5b64581e..46d17783d 100644
--- a/data/presets/presets/amenity/clinic.json
+++ b/data/presets/presets/amenity/clinic.json
@@ -1,6 +1,7 @@
 {
     "icon": "hospital",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/amenity/clock.json b/data/presets/presets/amenity/clock.json
index 1760ec6d9..d884fbdb8 100644
--- a/data/presets/presets/amenity/clock.json
+++ b/data/presets/presets/amenity/clock.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-clock",
     "fields": [
+        "name",
         "support",
         "display",
         "visibility",
diff --git a/data/presets/presets/amenity/college.json b/data/presets/presets/amenity/college.json
index 607cd163a..3f78d896c 100644
--- a/data/presets/presets/amenity/college.json
+++ b/data/presets/presets/amenity/college.json
@@ -1,6 +1,7 @@
 {
     "icon": "college",
     "fields": [
+        "name",
         "operator",
         "address",
         "internet_access",
diff --git a/data/presets/presets/amenity/community_centre.json b/data/presets/presets/amenity/community_centre.json
index 706e187fe..7726fabed 100644
--- a/data/presets/presets/amenity/community_centre.json
+++ b/data/presets/presets/amenity/community_centre.json
@@ -1,6 +1,7 @@
 {
     "icon": "town-hall",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area"
diff --git a/data/presets/presets/amenity/courthouse.json b/data/presets/presets/amenity/courthouse.json
index 431a13c1a..538a89bef 100644
--- a/data/presets/presets/amenity/courthouse.json
+++ b/data/presets/presets/amenity/courthouse.json
@@ -1,6 +1,7 @@
 {
     "icon": "town-hall",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area"
diff --git a/data/presets/presets/amenity/crematorium.json b/data/presets/presets/amenity/crematorium.json
index cde1bbe3f..012f72cff 100644
--- a/data/presets/presets/amenity/crematorium.json
+++ b/data/presets/presets/amenity/crematorium.json
@@ -1,6 +1,7 @@
 {
     "icon": "cemetery",
     "fields": [
+        "name",
         "website",
         "phone",
         "opening_hours",
diff --git a/data/presets/presets/amenity/dentist.json b/data/presets/presets/amenity/dentist.json
index 1d3b45240..44200211a 100644
--- a/data/presets/presets/amenity/dentist.json
+++ b/data/presets/presets/amenity/dentist.json
@@ -1,6 +1,7 @@
 {
     "icon": "dentist",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/amenity/doctors.json b/data/presets/presets/amenity/doctors.json
index 3753f26f4..2a765a01d 100644
--- a/data/presets/presets/amenity/doctors.json
+++ b/data/presets/presets/amenity/doctors.json
@@ -1,6 +1,7 @@
 {
     "icon": "hospital",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/amenity/dojo.json b/data/presets/presets/amenity/dojo.json
index 37a6ece19..07c78955e 100644
--- a/data/presets/presets/amenity/dojo.json
+++ b/data/presets/presets/amenity/dojo.json
@@ -1,6 +1,7 @@
 {
     "icon": "pitch",
     "fields": [
+        "name",
         "sport",
         "address",
         "building_area",
diff --git a/data/presets/presets/amenity/driving_school.json b/data/presets/presets/amenity/driving_school.json
index 7b709e73d..c5ca11fd9 100644
--- a/data/presets/presets/amenity/driving_school.json
+++ b/data/presets/presets/amenity/driving_school.json
@@ -1,6 +1,7 @@
 {
     "icon": "car",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/amenity/embassy.json b/data/presets/presets/amenity/embassy.json
index c871d9ba3..d4de062fa 100644
--- a/data/presets/presets/amenity/embassy.json
+++ b/data/presets/presets/amenity/embassy.json
@@ -1,6 +1,7 @@
 {
     "icon": "embassy",
     "fields": [
+        "name",
         "country",
         "address",
         "building_area"
diff --git a/data/presets/presets/amenity/fast_food.json b/data/presets/presets/amenity/fast_food.json
index caaabef0d..a7323541f 100644
--- a/data/presets/presets/amenity/fast_food.json
+++ b/data/presets/presets/amenity/fast_food.json
@@ -1,6 +1,7 @@
 {
     "icon": "fast-food",
     "fields": [
+        "name",
         "cuisine",
         "operator",
         "address",
diff --git a/data/presets/presets/amenity/ferry_terminal.json b/data/presets/presets/amenity/ferry_terminal.json
index 3e9c9ca99..aad03b6cb 100644
--- a/data/presets/presets/amenity/ferry_terminal.json
+++ b/data/presets/presets/amenity/ferry_terminal.json
@@ -1,6 +1,7 @@
 {
     "icon": "ferry",
     "fields": [
+        "name",
         "network",
         "operator",
         "address",
diff --git a/data/presets/presets/amenity/fire_station.json b/data/presets/presets/amenity/fire_station.json
index 35acbc5bd..6b2646b93 100644
--- a/data/presets/presets/amenity/fire_station.json
+++ b/data/presets/presets/amenity/fire_station.json
@@ -1,6 +1,7 @@
 {
     "icon": "fire-station",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area"
diff --git a/data/presets/presets/amenity/food_court.json b/data/presets/presets/amenity/food_court.json
index c3ed5a3d6..0e842e326 100644
--- a/data/presets/presets/amenity/food_court.json
+++ b/data/presets/presets/amenity/food_court.json
@@ -1,6 +1,7 @@
 {
     "icon": "restaurant",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/amenity/fuel.json b/data/presets/presets/amenity/fuel.json
index ce71543d2..1c973ab1c 100644
--- a/data/presets/presets/amenity/fuel.json
+++ b/data/presets/presets/amenity/fuel.json
@@ -1,6 +1,7 @@
 {
     "icon": "fuel",
     "fields": [
+        "name",
         "operator",
         "address",
         "opening_hours",
diff --git a/data/presets/presets/amenity/hospital.json b/data/presets/presets/amenity/hospital.json
index 998a5b0cb..870c70a3f 100644
--- a/data/presets/presets/amenity/hospital.json
+++ b/data/presets/presets/amenity/hospital.json
@@ -1,6 +1,7 @@
 {
     "icon": "hospital",
     "fields": [
+        "name",
         "operator",
         "address",
         "emergency"
diff --git a/data/presets/presets/amenity/ice_cream.json b/data/presets/presets/amenity/ice_cream.json
index 82d4beb2e..b62ee454e 100644
--- a/data/presets/presets/amenity/ice_cream.json
+++ b/data/presets/presets/amenity/ice_cream.json
@@ -1,6 +1,7 @@
 {
     "icon": "ice-cream",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours",
diff --git a/data/presets/presets/amenity/internet_cafe.json b/data/presets/presets/amenity/internet_cafe.json
index cae2b31e5..4e4d03b9a 100644
--- a/data/presets/presets/amenity/internet_cafe.json
+++ b/data/presets/presets/amenity/internet_cafe.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-mast",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/amenity/kindergarten.json b/data/presets/presets/amenity/kindergarten.json
index 2d28d6afe..db443160e 100644
--- a/data/presets/presets/amenity/kindergarten.json
+++ b/data/presets/presets/amenity/kindergarten.json
@@ -1,6 +1,7 @@
 {
     "icon": "school",
     "fields": [
+        "name",
         "operator",
         "address"
     ],
diff --git a/data/presets/presets/amenity/library.json b/data/presets/presets/amenity/library.json
index 9fe3c68a9..0f3a48c77 100644
--- a/data/presets/presets/amenity/library.json
+++ b/data/presets/presets/amenity/library.json
@@ -1,6 +1,7 @@
 {
     "icon": "library",
     "fields": [
+        "name",
         "operator",
         "building_area",
         "address",
diff --git a/data/presets/presets/amenity/marketplace.json b/data/presets/presets/amenity/marketplace.json
index dffd4fe95..3b2628767 100644
--- a/data/presets/presets/amenity/marketplace.json
+++ b/data/presets/presets/amenity/marketplace.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/amenity/nightclub.json b/data/presets/presets/amenity/nightclub.json
index 67ff6e58c..67fe7e897 100644
--- a/data/presets/presets/amenity/nightclub.json
+++ b/data/presets/presets/amenity/nightclub.json
@@ -1,6 +1,7 @@
 {
     "icon": "bar",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/amenity/pavilion.json b/data/presets/presets/amenity/pavilion.json
index 6565194eb..201de7db7 100644
--- a/data/presets/presets/amenity/pavilion.json
+++ b/data/presets/presets/amenity/pavilion.json
@@ -2,7 +2,7 @@
     "icon": "shelter",
     "fields": [
         "bin",
-		"bench"
+        "bench"
     ],
     "geometry": [
         "point",
@@ -11,7 +11,7 @@
     ],
     "tags": {
         "amenity": "shelter",
-	"shelter_type": "pavilion"
+    "shelter_type": "pavilion"
     },
     "name": "Pavilion"
 }
diff --git a/data/presets/presets/amenity/pharmacy.json b/data/presets/presets/amenity/pharmacy.json
index 6c7a0a046..4e922e13b 100644
--- a/data/presets/presets/amenity/pharmacy.json
+++ b/data/presets/presets/amenity/pharmacy.json
@@ -1,6 +1,7 @@
 {
     "icon": "pharmacy",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/amenity/place_of_worship.json b/data/presets/presets/amenity/place_of_worship.json
index 1267dd81d..10ef8ed21 100644
--- a/data/presets/presets/amenity/place_of_worship.json
+++ b/data/presets/presets/amenity/place_of_worship.json
@@ -1,6 +1,7 @@
 {
     "icon": "place-of-worship",
     "fields": [
+        "name",
         "religion",
         "denomination",
         "address",
diff --git a/data/presets/presets/amenity/place_of_worship/buddhist.json b/data/presets/presets/amenity/place_of_worship/buddhist.json
index 4cc3ca76c..05349f99b 100644
--- a/data/presets/presets/amenity/place_of_worship/buddhist.json
+++ b/data/presets/presets/amenity/place_of_worship/buddhist.json
@@ -1,6 +1,7 @@
 {
     "icon": "buddhism",
     "fields": [
+        "name",
         "denomination",
         "building_area",
         "address",
diff --git a/data/presets/presets/amenity/place_of_worship/christian.json b/data/presets/presets/amenity/place_of_worship/christian.json
index ce523d1b3..ba27108b4 100644
--- a/data/presets/presets/amenity/place_of_worship/christian.json
+++ b/data/presets/presets/amenity/place_of_worship/christian.json
@@ -1,6 +1,7 @@
 {
     "icon": "religious-christian",
     "fields": [
+        "name",
         "denomination",
         "building_area",
         "address",
diff --git a/data/presets/presets/amenity/place_of_worship/hindu.json b/data/presets/presets/amenity/place_of_worship/hindu.json
index f2b57f78b..02a5c66a8 100644
--- a/data/presets/presets/amenity/place_of_worship/hindu.json
+++ b/data/presets/presets/amenity/place_of_worship/hindu.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-hinduist",
     "fields": [
+        "name",
         "denomination",
         "building_area",
         "address",
diff --git a/data/presets/presets/amenity/place_of_worship/jewish.json b/data/presets/presets/amenity/place_of_worship/jewish.json
index 5acf9d7ce..77b3fccd3 100644
--- a/data/presets/presets/amenity/place_of_worship/jewish.json
+++ b/data/presets/presets/amenity/place_of_worship/jewish.json
@@ -1,6 +1,7 @@
 {
     "icon": "religious-jewish",
     "fields": [
+        "name",
         "denomination",
         "building_area",
         "address",
diff --git a/data/presets/presets/amenity/place_of_worship/muslim.json b/data/presets/presets/amenity/place_of_worship/muslim.json
index d47c52a9b..729acc9a8 100644
--- a/data/presets/presets/amenity/place_of_worship/muslim.json
+++ b/data/presets/presets/amenity/place_of_worship/muslim.json
@@ -1,6 +1,7 @@
 {
     "icon": "religious-muslim",
     "fields": [
+        "name",
         "denomination",
         "building_area",
         "address",
diff --git a/data/presets/presets/amenity/place_of_worship/shinto.json b/data/presets/presets/amenity/place_of_worship/shinto.json
index ece48c7e4..49cf2bfca 100644
--- a/data/presets/presets/amenity/place_of_worship/shinto.json
+++ b/data/presets/presets/amenity/place_of_worship/shinto.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-shintoist",
     "fields": [
+        "name",
         "denomination",
         "building_area",
         "address",
diff --git a/data/presets/presets/amenity/place_of_worship/sikh.json b/data/presets/presets/amenity/place_of_worship/sikh.json
index 7e3e28570..fc1ad93d8 100644
--- a/data/presets/presets/amenity/place_of_worship/sikh.json
+++ b/data/presets/presets/amenity/place_of_worship/sikh.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-sikhist",
     "fields": [
+        "name",
         "denomination",
         "building_area",
         "address",
diff --git a/data/presets/presets/amenity/place_of_worship/taoist.json b/data/presets/presets/amenity/place_of_worship/taoist.json
index 0df3cd13a..795b1e6ea 100644
--- a/data/presets/presets/amenity/place_of_worship/taoist.json
+++ b/data/presets/presets/amenity/place_of_worship/taoist.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-taoist",
     "fields": [
+        "name",
         "denomination",
         "building_area",
         "address",
diff --git a/data/presets/presets/amenity/planetarium.json b/data/presets/presets/amenity/planetarium.json
index 3e703dd9c..4e8efc5b8 100644
--- a/data/presets/presets/amenity/planetarium.json
+++ b/data/presets/presets/amenity/planetarium.json
@@ -1,6 +1,7 @@
 {
     "icon": "museum",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/amenity/police.json b/data/presets/presets/amenity/police.json
index 82a83b735..7e91035f0 100644
--- a/data/presets/presets/amenity/police.json
+++ b/data/presets/presets/amenity/police.json
@@ -1,6 +1,7 @@
 {
     "icon": "police",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area"
diff --git a/data/presets/presets/amenity/post_office.json b/data/presets/presets/amenity/post_office.json
index 88ed38dcb..d6a501683 100644
--- a/data/presets/presets/amenity/post_office.json
+++ b/data/presets/presets/amenity/post_office.json
@@ -1,6 +1,7 @@
 {
     "icon": "post",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/amenity/prison.json b/data/presets/presets/amenity/prison.json
index e42ce18b2..59cf85070 100644
--- a/data/presets/presets/amenity/prison.json
+++ b/data/presets/presets/amenity/prison.json
@@ -1,6 +1,7 @@
 {
     "icon": "prison",
     "fields": [
+        "name",
         "operator",
         "address"
     ],
diff --git a/data/presets/presets/amenity/pub.json b/data/presets/presets/amenity/pub.json
index d08ea6d71..102409d68 100644
--- a/data/presets/presets/amenity/pub.json
+++ b/data/presets/presets/amenity/pub.json
@@ -1,6 +1,7 @@
 {
     "icon": "beer",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours",
diff --git a/data/presets/presets/amenity/public_bath.json b/data/presets/presets/amenity/public_bath.json
index 8fd83ea2d..ecfd962e2 100644
--- a/data/presets/presets/amenity/public_bath.json
+++ b/data/presets/presets/amenity/public_bath.json
@@ -1,6 +1,7 @@
 {
     "icon": "water",
     "fields": [
+        "name",
         "bath/type",
         "bath/open_air",
         "bath/sand_bath",
diff --git a/data/presets/presets/amenity/ranger_station.json b/data/presets/presets/amenity/ranger_station.json
index d9b2e6ebc..11a89ebbe 100644
--- a/data/presets/presets/amenity/ranger_station.json
+++ b/data/presets/presets/amenity/ranger_station.json
@@ -1,5 +1,6 @@
 {
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/amenity/recycling_centre.json b/data/presets/presets/amenity/recycling_centre.json
index ba3032a1d..3ab57bd17 100644
--- a/data/presets/presets/amenity/recycling_centre.json
+++ b/data/presets/presets/amenity/recycling_centre.json
@@ -1,6 +1,7 @@
 {
     "icon": "waste-basket",
     "fields": [
+        "name",
         "operator",
         "address",
         "opening_hours",
diff --git a/data/presets/presets/amenity/restaurant.json b/data/presets/presets/amenity/restaurant.json
index fd4d2873c..6007f2a65 100644
--- a/data/presets/presets/amenity/restaurant.json
+++ b/data/presets/presets/amenity/restaurant.json
@@ -1,6 +1,7 @@
 {
     "icon": "restaurant",
     "fields": [
+        "name",
         "cuisine",
         "address",
         "building_area",
diff --git a/data/presets/presets/amenity/school.json b/data/presets/presets/amenity/school.json
index e3b1f38d3..6523a26c7 100644
--- a/data/presets/presets/amenity/school.json
+++ b/data/presets/presets/amenity/school.json
@@ -1,6 +1,7 @@
 {
     "icon": "school",
     "fields": [
+        "name",
         "operator",
         "address"
     ],
diff --git a/data/presets/presets/amenity/scrapyard.json b/data/presets/presets/amenity/scrapyard.json
index 569127d88..57fd893a8 100644
--- a/data/presets/presets/amenity/scrapyard.json
+++ b/data/presets/presets/amenity/scrapyard.json
@@ -1,6 +1,7 @@
 {
     "icon": "car",
     "fields": [
+        "name",
         "operator",
         "address",
         "opening_hours"
diff --git a/data/presets/presets/amenity/shelter.json b/data/presets/presets/amenity/shelter.json
index 068728f6f..cd367dc8d 100644
--- a/data/presets/presets/amenity/shelter.json
+++ b/data/presets/presets/amenity/shelter.json
@@ -1,6 +1,7 @@
 {
     "icon": "shelter",
     "fields": [
+        "name",
         "shelter_type",
         "bin"
     ],
diff --git a/data/presets/presets/amenity/social_facility.json b/data/presets/presets/amenity/social_facility.json
index ef77abf70..aa24ed6b2 100644
--- a/data/presets/presets/amenity/social_facility.json
+++ b/data/presets/presets/amenity/social_facility.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-social-facility",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/amenity/social_facility/food_bank.json b/data/presets/presets/amenity/social_facility/food_bank.json
index 930d81eb3..5d14e231e 100644
--- a/data/presets/presets/amenity/social_facility/food_bank.json
+++ b/data/presets/presets/amenity/social_facility/food_bank.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-social-facility",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/amenity/social_facility/group_home.json b/data/presets/presets/amenity/social_facility/group_home.json
index 26cdd97e0..e615ed06a 100644
--- a/data/presets/presets/amenity/social_facility/group_home.json
+++ b/data/presets/presets/amenity/social_facility/group_home.json
@@ -1,6 +1,7 @@
 {
     "icon": "wheelchair",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
@@ -16,7 +17,9 @@
     "terms": [
         "old",
         "senior",
-        "living"
+        "living",
+        "care home",
+        "assisted living"
     ],
     "tags": {
         "amenity": "social_facility",
diff --git a/data/presets/presets/amenity/social_facility/homeless_shelter.json b/data/presets/presets/amenity/social_facility/homeless_shelter.json
index 09c285bf3..59bc7035a 100644
--- a/data/presets/presets/amenity/social_facility/homeless_shelter.json
+++ b/data/presets/presets/amenity/social_facility/homeless_shelter.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-social-facility",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/amenity/social_facility/nursing_home.json b/data/presets/presets/amenity/social_facility/nursing_home.json
index 63cd2209b..8a83260f3 100644
--- a/data/presets/presets/amenity/social_facility/nursing_home.json
+++ b/data/presets/presets/amenity/social_facility/nursing_home.json
@@ -1,6 +1,7 @@
 {
     "icon": "wheelchair",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
@@ -18,7 +19,8 @@
         "living",
         "nursing",
         "old",
-        "senior"
+        "senior",
+        "assisted living"
     ],
     "tags": {
         "amenity": "social_facility",
diff --git a/data/presets/presets/amenity/studio.json b/data/presets/presets/amenity/studio.json
index 1b43c401d..42cddfc9b 100644
--- a/data/presets/presets/amenity/studio.json
+++ b/data/presets/presets/amenity/studio.json
@@ -1,6 +1,7 @@
 {
     "icon": "karaoke",
     "fields": [
+        "name",
         "studio",
         "address",
         "building_area"
diff --git a/data/presets/presets/amenity/taxi.json b/data/presets/presets/amenity/taxi.json
index 780c835cc..7d240ea2f 100644
--- a/data/presets/presets/amenity/taxi.json
+++ b/data/presets/presets/amenity/taxi.json
@@ -1,6 +1,7 @@
 {
     "icon": "car",
     "fields": [
+        "name",
         "operator",
         "capacity"
     ],
diff --git a/data/presets/presets/amenity/theatre.json b/data/presets/presets/amenity/theatre.json
index 8d1773f38..57fa0c7b2 100644
--- a/data/presets/presets/amenity/theatre.json
+++ b/data/presets/presets/amenity/theatre.json
@@ -1,6 +1,7 @@
 {
     "icon": "theatre",
     "fields": [
+	    "name",
         "operator",
         "address",
         "building_area"
diff --git a/data/presets/presets/amenity/townhall.json b/data/presets/presets/amenity/townhall.json
index de4cbd2e5..19ac61209 100644
--- a/data/presets/presets/amenity/townhall.json
+++ b/data/presets/presets/amenity/townhall.json
@@ -1,6 +1,7 @@
 {
     "icon": "town-hall",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area"
diff --git a/data/presets/presets/amenity/university.json b/data/presets/presets/amenity/university.json
index 4430d3a67..aeac5e09b 100644
--- a/data/presets/presets/amenity/university.json
+++ b/data/presets/presets/amenity/university.json
@@ -1,6 +1,7 @@
 {
     "icon": "college",
     "fields": [
+        "name",
         "operator",
         "address",
         "internet_access",
diff --git a/data/presets/presets/amenity/vending_machine/excrement_bags.json b/data/presets/presets/amenity/vending_machine/excrement_bags.json
index 610724380..c9840f1bd 100644
--- a/data/presets/presets/amenity/vending_machine/excrement_bags.json
+++ b/data/presets/presets/amenity/vending_machine/excrement_bags.json
@@ -3,7 +3,6 @@
     "fields": [
         "operator",
         "fee",
-        "bin",
         "payment_multi",
         "currency_multi"
     ],
diff --git a/data/presets/presets/amenity/veterinary.json b/data/presets/presets/amenity/veterinary.json
index 34af360ec..f99e6bf84 100644
--- a/data/presets/presets/amenity/veterinary.json
+++ b/data/presets/presets/amenity/veterinary.json
@@ -1,6 +1,7 @@
 {
     "icon": "veterinary",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/amenity/waste_transfer_station.json b/data/presets/presets/amenity/waste_transfer_station.json
index d28506f7b..2df923bab 100644
--- a/data/presets/presets/amenity/waste_transfer_station.json
+++ b/data/presets/presets/amenity/waste_transfer_station.json
@@ -1,6 +1,7 @@
 {
     "icon": "waste-basket",
     "fields": [
+        "name",
         "operator",
         "address",
         "opening_hours"
diff --git a/data/presets/presets/area.json b/data/presets/presets/area.json
index f1bbfe52a..a3b1c6fa5 100644
--- a/data/presets/presets/area.json
+++ b/data/presets/presets/area.json
@@ -1,8 +1,11 @@
 {
     "name": "Area",
+    "fields": [
+        "name"
+    ],
     "tags": {
         "area": "yes"
     },
     "geometry": ["area"],
     "matchScore": 0.1
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/area/highway.json b/data/presets/presets/area/highway.json
index 1f9972fe1..7de1c08b8 100644
--- a/data/presets/presets/area/highway.json
+++ b/data/presets/presets/area/highway.json
@@ -1,5 +1,6 @@
 {
     "fields": [
+        "name",
         "area/highway"
     ],
     "geometry": [
diff --git a/data/presets/presets/boundary/administrative.json b/data/presets/presets/boundary/administrative.json
index 194f8ec72..4b24acec1 100644
--- a/data/presets/presets/boundary/administrative.json
+++ b/data/presets/presets/boundary/administrative.json
@@ -7,6 +7,7 @@
         "boundary": "administrative"
     },
     "fields": [
+        "name",
         "admin_level"
     ]
 }
\ No newline at end of file
diff --git a/data/presets/presets/building.json b/data/presets/presets/building.json
index 62c8fa034..c59c33a65 100644
--- a/data/presets/presets/building.json
+++ b/data/presets/presets/building.json
@@ -1,6 +1,7 @@
 {
     "icon": "home",
     "fields": [
+        "name",
         "building",
         "levels",
         "address"
diff --git a/data/presets/presets/building/_bunker.json b/data/presets/presets/building/_bunker.json
index 6810768af..17cc2f28d 100644
--- a/data/presets/presets/building/_bunker.json
+++ b/data/presets/presets/building/_bunker.json
@@ -1,5 +1,6 @@
 {
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/_train_station.json b/data/presets/presets/building/_train_station.json
index 6a4d04a18..f83e337a8 100644
--- a/data/presets/presets/building/_train_station.json
+++ b/data/presets/presets/building/_train_station.json
@@ -1,6 +1,7 @@
 {
     "icon": "building",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/apartments.json b/data/presets/presets/building/apartments.json
index 03b8d7d0d..4344b6336 100644
--- a/data/presets/presets/building/apartments.json
+++ b/data/presets/presets/building/apartments.json
@@ -1,6 +1,7 @@
 {
     "icon": "building",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/barn.json b/data/presets/presets/building/barn.json
index a41e2fa08..0f6b1ca68 100644
--- a/data/presets/presets/building/barn.json
+++ b/data/presets/presets/building/barn.json
@@ -1,6 +1,7 @@
 {
     "icon": "farm",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/cabin.json b/data/presets/presets/building/cabin.json
index 2a860557e..f5aa05711 100644
--- a/data/presets/presets/building/cabin.json
+++ b/data/presets/presets/building/cabin.json
@@ -1,6 +1,7 @@
 {
     "icon": "home",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/cathedral.json b/data/presets/presets/building/cathedral.json
index 9e1c3f9cd..3921c0dcf 100644
--- a/data/presets/presets/building/cathedral.json
+++ b/data/presets/presets/building/cathedral.json
@@ -1,6 +1,7 @@
 {
     "icon": "place-of-worship",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/chapel.json b/data/presets/presets/building/chapel.json
index 854c42afc..13199f4da 100644
--- a/data/presets/presets/building/chapel.json
+++ b/data/presets/presets/building/chapel.json
@@ -1,6 +1,7 @@
 {
     "icon": "place-of-worship",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/church.json b/data/presets/presets/building/church.json
index a3c225023..695499bef 100644
--- a/data/presets/presets/building/church.json
+++ b/data/presets/presets/building/church.json
@@ -1,6 +1,7 @@
 {
     "icon": "place-of-worship",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/college.json b/data/presets/presets/building/college.json
index 2e6f021f2..9821c1575 100644
--- a/data/presets/presets/building/college.json
+++ b/data/presets/presets/building/college.json
@@ -1,6 +1,7 @@
 {
     "icon": "building",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/commercial.json b/data/presets/presets/building/commercial.json
index 76067d271..2c548315a 100644
--- a/data/presets/presets/building/commercial.json
+++ b/data/presets/presets/building/commercial.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "address",
         "levels",
         "smoking"
diff --git a/data/presets/presets/building/construction.json b/data/presets/presets/building/construction.json
index ab1eb7845..bb5c58f7d 100644
--- a/data/presets/presets/building/construction.json
+++ b/data/presets/presets/building/construction.json
@@ -1,6 +1,7 @@
 {
     "icon": "building",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/detached.json b/data/presets/presets/building/detached.json
index d51fd96e1..128979487 100644
--- a/data/presets/presets/building/detached.json
+++ b/data/presets/presets/building/detached.json
@@ -1,6 +1,7 @@
 {
     "icon": "home",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/dormitory.json b/data/presets/presets/building/dormitory.json
index 3d584ac95..14e76fb89 100644
--- a/data/presets/presets/building/dormitory.json
+++ b/data/presets/presets/building/dormitory.json
@@ -1,6 +1,7 @@
 {
     "icon": "building",
     "fields": [
+        "name",
         "address",
         "levels",
         "smoking"
diff --git a/data/presets/presets/building/garage.json b/data/presets/presets/building/garage.json
index 7ffd905d1..590a868b6 100644
--- a/data/presets/presets/building/garage.json
+++ b/data/presets/presets/building/garage.json
@@ -1,6 +1,7 @@
 {
     "icon": "warehouse",
     "fields": [
+        "name",
         "capacity"
     ],
     "geometry": [
diff --git a/data/presets/presets/building/garages.json b/data/presets/presets/building/garages.json
index 3b19c6fea..1a5465c38 100644
--- a/data/presets/presets/building/garages.json
+++ b/data/presets/presets/building/garages.json
@@ -1,6 +1,7 @@
 {
     "icon": "warehouse",
     "fields": [
+        "name",
         "capacity"
     ],
     "geometry": [
diff --git a/data/presets/presets/building/greenhouse.json b/data/presets/presets/building/greenhouse.json
index 727fd4e02..1299a2f91 100644
--- a/data/presets/presets/building/greenhouse.json
+++ b/data/presets/presets/building/greenhouse.json
@@ -1,6 +1,7 @@
 {
     "icon": "garden-center",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/hospital.json b/data/presets/presets/building/hospital.json
index 0f7dadb64..1aea06ba9 100644
--- a/data/presets/presets/building/hospital.json
+++ b/data/presets/presets/building/hospital.json
@@ -1,6 +1,7 @@
 {
     "icon": "building",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/hotel.json b/data/presets/presets/building/hotel.json
index eb76a47ca..233b1e3db 100644
--- a/data/presets/presets/building/hotel.json
+++ b/data/presets/presets/building/hotel.json
@@ -1,6 +1,7 @@
 {
     "icon": "building",
     "fields": [
+        "name",
         "address",
         "levels",
         "smoking"
diff --git a/data/presets/presets/building/house.json b/data/presets/presets/building/house.json
index 1ba297965..fa4cf8e79 100644
--- a/data/presets/presets/building/house.json
+++ b/data/presets/presets/building/house.json
@@ -1,6 +1,7 @@
 {
     "icon": "home",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/hut.json b/data/presets/presets/building/hut.json
index 0d8f7f574..a3c5d82a8 100644
--- a/data/presets/presets/building/hut.json
+++ b/data/presets/presets/building/hut.json
@@ -2,6 +2,10 @@
     "geometry": [
         "area"
     ],
+    "fields": [
+        "name"
+    ],
+
     "tags": {
         "building": "hut"
     },
diff --git a/data/presets/presets/building/industrial.json b/data/presets/presets/building/industrial.json
index 53a2d5eb4..df96a5424 100644
--- a/data/presets/presets/building/industrial.json
+++ b/data/presets/presets/building/industrial.json
@@ -1,6 +1,7 @@
 {
     "icon": "industry",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/kindergarten.json b/data/presets/presets/building/kindergarten.json
index 5d168a124..0eb543acb 100644
--- a/data/presets/presets/building/kindergarten.json
+++ b/data/presets/presets/building/kindergarten.json
@@ -1,6 +1,7 @@
 {
     "icon": "building",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/public.json b/data/presets/presets/building/public.json
index 40ba7959e..5a67094b7 100644
--- a/data/presets/presets/building/public.json
+++ b/data/presets/presets/building/public.json
@@ -1,6 +1,7 @@
 {
     "icon": "building",
     "fields": [
+        "name",
         "address",
         "levels",
         "smoking"
diff --git a/data/presets/presets/building/residential.json b/data/presets/presets/building/residential.json
index 6b725c9f5..b4584a5c1 100644
--- a/data/presets/presets/building/residential.json
+++ b/data/presets/presets/building/residential.json
@@ -1,6 +1,7 @@
 {
     "icon": "residential-community",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/retail.json b/data/presets/presets/building/retail.json
index d10dc8119..0a24560ec 100644
--- a/data/presets/presets/building/retail.json
+++ b/data/presets/presets/building/retail.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "address",
         "levels",
         "smoking"
diff --git a/data/presets/presets/building/roof.json b/data/presets/presets/building/roof.json
index ca31486a1..fac6166ed 100644
--- a/data/presets/presets/building/roof.json
+++ b/data/presets/presets/building/roof.json
@@ -1,6 +1,7 @@
 {
     "icon": "shelter",
     "fields": [
+        "name",
         "address"
     ],
     "geometry": [
diff --git a/data/presets/presets/building/school.json b/data/presets/presets/building/school.json
index c8427df72..5dc124d24 100644
--- a/data/presets/presets/building/school.json
+++ b/data/presets/presets/building/school.json
@@ -1,6 +1,7 @@
 {
     "icon": "building",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/semidetached_house.json b/data/presets/presets/building/semidetached_house.json
index 1d4833216..413f12bd0 100644
--- a/data/presets/presets/building/semidetached_house.json
+++ b/data/presets/presets/building/semidetached_house.json
@@ -1,6 +1,7 @@
 {
     "icon": "home",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/shed.json b/data/presets/presets/building/shed.json
index 8415a914b..9a49d2ddd 100644
--- a/data/presets/presets/building/shed.json
+++ b/data/presets/presets/building/shed.json
@@ -1,6 +1,7 @@
 {
     "icon": "home",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/stable.json b/data/presets/presets/building/stable.json
index 524018cfa..3e21782b7 100644
--- a/data/presets/presets/building/stable.json
+++ b/data/presets/presets/building/stable.json
@@ -1,6 +1,7 @@
 {
     "icon": "horse-riding",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/static_caravan.json b/data/presets/presets/building/static_caravan.json
index 3efb99ef2..8ea7a1cc5 100644
--- a/data/presets/presets/building/static_caravan.json
+++ b/data/presets/presets/building/static_caravan.json
@@ -1,6 +1,7 @@
 {
     "icon": "home",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/terrace.json b/data/presets/presets/building/terrace.json
index 02cd1546e..75813c99e 100644
--- a/data/presets/presets/building/terrace.json
+++ b/data/presets/presets/building/terrace.json
@@ -1,6 +1,7 @@
 {
     "icon": "building",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/university.json b/data/presets/presets/building/university.json
index e34385f1d..b4d39df4c 100644
--- a/data/presets/presets/building/university.json
+++ b/data/presets/presets/building/university.json
@@ -1,6 +1,7 @@
 {
     "icon": "building",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/building/warehouse.json b/data/presets/presets/building/warehouse.json
index 3dcba721b..8e19b4887 100644
--- a/data/presets/presets/building/warehouse.json
+++ b/data/presets/presets/building/warehouse.json
@@ -1,6 +1,7 @@
 {
     "icon": "warehouse",
     "fields": [
+        "name",
         "address",
         "levels"
     ],
diff --git a/data/presets/presets/camp_site/camp_pitch.json b/data/presets/presets/camp_site/camp_pitch.json
index d7d1b1704..35bfc39e2 100644
--- a/data/presets/presets/camp_site/camp_pitch.json
+++ b/data/presets/presets/camp_site/camp_pitch.json
@@ -1,6 +1,7 @@
 {
     "icon": "campsite",
     "fields": [
+        "name",
         "ref"
     ],
     "geometry": [
diff --git a/data/presets/presets/club.json b/data/presets/presets/club.json
index 45d86d73e..4ba1c4595 100644
--- a/data/presets/presets/club.json
+++ b/data/presets/presets/club.json
@@ -1,6 +1,7 @@
 {
     "icon": "heart",
     "fields": [
+        "name",
         "club",
         "operator",
         "address",
diff --git a/data/presets/presets/craft.json b/data/presets/presets/craft.json
index 912aaee54..2f88a6113 100644
--- a/data/presets/presets/craft.json
+++ b/data/presets/presets/craft.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "craft",
         "operator",
         "address",
diff --git a/data/presets/presets/craft/_jeweler.json b/data/presets/presets/craft/_jeweler.json
index 220d068c0..370062118 100644
--- a/data/presets/presets/craft/_jeweler.json
+++ b/data/presets/presets/craft/_jeweler.json
@@ -1,6 +1,7 @@
 {
     "icon": "marker-stroked",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/_locksmith.json b/data/presets/presets/craft/_locksmith.json
index 39f78dc84..4379d9c59 100644
--- a/data/presets/presets/craft/_locksmith.json
+++ b/data/presets/presets/craft/_locksmith.json
@@ -1,6 +1,7 @@
 {
     "icon": "marker-stroked",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/_optician.json b/data/presets/presets/craft/_optician.json
index 925dd6378..4e62b538b 100644
--- a/data/presets/presets/craft/_optician.json
+++ b/data/presets/presets/craft/_optician.json
@@ -1,6 +1,7 @@
 {
     "icon": "marker-stroked",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/_tailor.json b/data/presets/presets/craft/_tailor.json
index d11d93a75..c1c59f8b8 100644
--- a/data/presets/presets/craft/_tailor.json
+++ b/data/presets/presets/craft/_tailor.json
@@ -1,6 +1,7 @@
 {
     "icon": "clothing-store",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/basket_maker.json b/data/presets/presets/craft/basket_maker.json
index 537c1526e..5cc04dd87 100644
--- a/data/presets/presets/craft/basket_maker.json
+++ b/data/presets/presets/craft/basket_maker.json
@@ -1,6 +1,7 @@
 {
     "icon": "art-gallery",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/beekeeper.json b/data/presets/presets/craft/beekeeper.json
index 8e300a28b..b58ce6a31 100644
--- a/data/presets/presets/craft/beekeeper.json
+++ b/data/presets/presets/craft/beekeeper.json
@@ -1,6 +1,7 @@
 {
     "icon": "farm",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/blacksmith.json b/data/presets/presets/craft/blacksmith.json
index 977b5fd22..9f640cf4c 100644
--- a/data/presets/presets/craft/blacksmith.json
+++ b/data/presets/presets/craft/blacksmith.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/boatbuilder.json b/data/presets/presets/craft/boatbuilder.json
index 5eb9064f0..4a66954b2 100644
--- a/data/presets/presets/craft/boatbuilder.json
+++ b/data/presets/presets/craft/boatbuilder.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/bookbinder.json b/data/presets/presets/craft/bookbinder.json
index 0bf51a2ef..2d7bead7b 100644
--- a/data/presets/presets/craft/bookbinder.json
+++ b/data/presets/presets/craft/bookbinder.json
@@ -1,6 +1,7 @@
 {
     "icon": "library",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/brewery.json b/data/presets/presets/craft/brewery.json
index 295759537..f570748ee 100644
--- a/data/presets/presets/craft/brewery.json
+++ b/data/presets/presets/craft/brewery.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-storage-tank",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/carpenter.json b/data/presets/presets/craft/carpenter.json
index 30b74ccef..93e299075 100644
--- a/data/presets/presets/craft/carpenter.json
+++ b/data/presets/presets/craft/carpenter.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/carpet_layer.json b/data/presets/presets/craft/carpet_layer.json
index bfb2bb9d4..4b3a76e96 100644
--- a/data/presets/presets/craft/carpet_layer.json
+++ b/data/presets/presets/craft/carpet_layer.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/caterer.json b/data/presets/presets/craft/caterer.json
index ea09c8d1e..e82631be9 100644
--- a/data/presets/presets/craft/caterer.json
+++ b/data/presets/presets/craft/caterer.json
@@ -1,6 +1,7 @@
 {
     "icon": "restaurant",
     "fields": [
+        "name",
         "cuisine",
         "operator",
         "address",
diff --git a/data/presets/presets/craft/clockmaker.json b/data/presets/presets/craft/clockmaker.json
index f531c4ee8..11d8357bb 100644
--- a/data/presets/presets/craft/clockmaker.json
+++ b/data/presets/presets/craft/clockmaker.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-clock",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/confectionery.json b/data/presets/presets/craft/confectionery.json
index aaa40b8c1..cff18c09e 100644
--- a/data/presets/presets/craft/confectionery.json
+++ b/data/presets/presets/craft/confectionery.json
@@ -1,6 +1,7 @@
 {
     "icon": "bakery",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/distillery.json b/data/presets/presets/craft/distillery.json
index 9cefeb5c8..be2bd1a90 100644
--- a/data/presets/presets/craft/distillery.json
+++ b/data/presets/presets/craft/distillery.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-storage-tank",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/dressmaker.json b/data/presets/presets/craft/dressmaker.json
index b1bcd6ae2..44ecbafe1 100644
--- a/data/presets/presets/craft/dressmaker.json
+++ b/data/presets/presets/craft/dressmaker.json
@@ -1,6 +1,7 @@
 {
     "icon": "clothing-store",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/electrician.json b/data/presets/presets/craft/electrician.json
index 5a083e228..36c99cdd3 100644
--- a/data/presets/presets/craft/electrician.json
+++ b/data/presets/presets/craft/electrician.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-power",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/electronics_repair.json b/data/presets/presets/craft/electronics_repair.json
index 747ceaf5f..08cb7f3e4 100644
--- a/data/presets/presets/craft/electronics_repair.json
+++ b/data/presets/presets/craft/electronics_repair.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/gardener.json b/data/presets/presets/craft/gardener.json
index b3b56e7cf..6a5635d82 100644
--- a/data/presets/presets/craft/gardener.json
+++ b/data/presets/presets/craft/gardener.json
@@ -1,6 +1,7 @@
 {
     "icon": "garden",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/glaziery.json b/data/presets/presets/craft/glaziery.json
index 00071c201..5e0caa60f 100644
--- a/data/presets/presets/craft/glaziery.json
+++ b/data/presets/presets/craft/glaziery.json
@@ -1,6 +1,7 @@
 {
     "icon": "fire-station",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/handicraft.json b/data/presets/presets/craft/handicraft.json
index 9766bcf77..00833784f 100644
--- a/data/presets/presets/craft/handicraft.json
+++ b/data/presets/presets/craft/handicraft.json
@@ -1,6 +1,7 @@
 {
     "icon": "art-gallery",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/hvac.json b/data/presets/presets/craft/hvac.json
index e6bacb0ce..f696ba20d 100644
--- a/data/presets/presets/craft/hvac.json
+++ b/data/presets/presets/craft/hvac.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/insulator.json b/data/presets/presets/craft/insulator.json
index a37427766..926c437e6 100644
--- a/data/presets/presets/craft/insulator.json
+++ b/data/presets/presets/craft/insulator.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/key_cutter.json b/data/presets/presets/craft/key_cutter.json
index ba04dd5f3..1f47f7c8e 100644
--- a/data/presets/presets/craft/key_cutter.json
+++ b/data/presets/presets/craft/key_cutter.json
@@ -1,6 +1,7 @@
 {
     "icon": "marker-stroked",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/metal_construction.json b/data/presets/presets/craft/metal_construction.json
index f944ae636..acb6a6f9d 100644
--- a/data/presets/presets/craft/metal_construction.json
+++ b/data/presets/presets/craft/metal_construction.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/painter.json b/data/presets/presets/craft/painter.json
index 3c5759930..2fa505def 100644
--- a/data/presets/presets/craft/painter.json
+++ b/data/presets/presets/craft/painter.json
@@ -1,6 +1,7 @@
 {
     "icon": "art-gallery",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/photographer.json b/data/presets/presets/craft/photographer.json
index b1fb78aba..c265193d2 100644
--- a/data/presets/presets/craft/photographer.json
+++ b/data/presets/presets/craft/photographer.json
@@ -1,6 +1,7 @@
 {
     "icon": "attraction",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/photographic_laboratory.json b/data/presets/presets/craft/photographic_laboratory.json
index 9efe88bb5..99326ffe0 100644
--- a/data/presets/presets/craft/photographic_laboratory.json
+++ b/data/presets/presets/craft/photographic_laboratory.json
@@ -1,6 +1,7 @@
 {
     "icon": "attraction",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/plasterer.json b/data/presets/presets/craft/plasterer.json
index b92bb3ef8..145154f49 100644
--- a/data/presets/presets/craft/plasterer.json
+++ b/data/presets/presets/craft/plasterer.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/plumber.json b/data/presets/presets/craft/plumber.json
index 69b5bb2cb..e086ea39a 100644
--- a/data/presets/presets/craft/plumber.json
+++ b/data/presets/presets/craft/plumber.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/pottery.json b/data/presets/presets/craft/pottery.json
index 203705f20..982b16e8a 100644
--- a/data/presets/presets/craft/pottery.json
+++ b/data/presets/presets/craft/pottery.json
@@ -1,6 +1,7 @@
 {
     "icon": "art-gallery",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/rigger.json b/data/presets/presets/craft/rigger.json
index dc707dcf8..e5f6be6ec 100644
--- a/data/presets/presets/craft/rigger.json
+++ b/data/presets/presets/craft/rigger.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/roofer.json b/data/presets/presets/craft/roofer.json
index a1bed47df..31863245b 100644
--- a/data/presets/presets/craft/roofer.json
+++ b/data/presets/presets/craft/roofer.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/saddler.json b/data/presets/presets/craft/saddler.json
index b86683961..0d28316cd 100644
--- a/data/presets/presets/craft/saddler.json
+++ b/data/presets/presets/craft/saddler.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/sailmaker.json b/data/presets/presets/craft/sailmaker.json
index 11a6d4813..9398f8b2f 100644
--- a/data/presets/presets/craft/sailmaker.json
+++ b/data/presets/presets/craft/sailmaker.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/sawmill.json b/data/presets/presets/craft/sawmill.json
index 1f2efab66..a32095e3b 100644
--- a/data/presets/presets/craft/sawmill.json
+++ b/data/presets/presets/craft/sawmill.json
@@ -1,6 +1,7 @@
 {
     "icon": "logging",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/scaffolder.json b/data/presets/presets/craft/scaffolder.json
index de0b9e3e9..76e1b7066 100644
--- a/data/presets/presets/craft/scaffolder.json
+++ b/data/presets/presets/craft/scaffolder.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/sculpter.json b/data/presets/presets/craft/sculpter.json
index e0d1f0976..6e13b2042 100644
--- a/data/presets/presets/craft/sculpter.json
+++ b/data/presets/presets/craft/sculpter.json
@@ -1,6 +1,7 @@
 {
     "icon": "art-gallery",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/shoemaker.json b/data/presets/presets/craft/shoemaker.json
index 4f17689c5..1a0264792 100644
--- a/data/presets/presets/craft/shoemaker.json
+++ b/data/presets/presets/craft/shoemaker.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/stonemason.json b/data/presets/presets/craft/stonemason.json
index cd9ce55f5..130b774fd 100644
--- a/data/presets/presets/craft/stonemason.json
+++ b/data/presets/presets/craft/stonemason.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/sweep.json b/data/presets/presets/craft/sweep.json
index 4c24fac9c..fbc3f164e 100644
--- a/data/presets/presets/craft/sweep.json
+++ b/data/presets/presets/craft/sweep.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-chimney",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/tiler.json b/data/presets/presets/craft/tiler.json
index e92161882..bdc64cb3d 100644
--- a/data/presets/presets/craft/tiler.json
+++ b/data/presets/presets/craft/tiler.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/tinsmith.json b/data/presets/presets/craft/tinsmith.json
index 43f651ddf..ddde08555 100644
--- a/data/presets/presets/craft/tinsmith.json
+++ b/data/presets/presets/craft/tinsmith.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/upholsterer.json b/data/presets/presets/craft/upholsterer.json
index 08d663299..ec46b95e4 100644
--- a/data/presets/presets/craft/upholsterer.json
+++ b/data/presets/presets/craft/upholsterer.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/watchmaker.json b/data/presets/presets/craft/watchmaker.json
index f73465de1..f83f2a63d 100644
--- a/data/presets/presets/craft/watchmaker.json
+++ b/data/presets/presets/craft/watchmaker.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-clock",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/window_construction.json b/data/presets/presets/craft/window_construction.json
index 1fd837a55..3889cf72a 100644
--- a/data/presets/presets/craft/window_construction.json
+++ b/data/presets/presets/craft/window_construction.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/craft/winery.json b/data/presets/presets/craft/winery.json
index e00ee7e14..7cc3b83b6 100644
--- a/data/presets/presets/craft/winery.json
+++ b/data/presets/presets/craft/winery.json
@@ -1,6 +1,7 @@
 {
     "icon": "alcohol-shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/emergency/ambulance_station.json b/data/presets/presets/emergency/ambulance_station.json
index db39e6e21..1c896479f 100644
--- a/data/presets/presets/emergency/ambulance_station.json
+++ b/data/presets/presets/emergency/ambulance_station.json
@@ -1,6 +1,7 @@
 {
     "icon": "hospital",
     "fields": [
+        "name",
         "operator",
         "building_area",
         "address"
diff --git a/data/presets/presets/footway/crossing.json b/data/presets/presets/footway/crossing.json
index 293e22af8..6726decff 100644
--- a/data/presets/presets/footway/crossing.json
+++ b/data/presets/presets/footway/crossing.json
@@ -1,5 +1,6 @@
 {
     "fields": [
+        "name",
         "crossing",
         "access",
         "surface",
diff --git a/data/presets/presets/footway/crosswalk.json b/data/presets/presets/footway/crosswalk.json
index b4daf5f29..f77176c93 100644
--- a/data/presets/presets/footway/crosswalk.json
+++ b/data/presets/presets/footway/crosswalk.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-footway",
     "fields": [
+        "name",
         "crossing",
         "access",
         "surface",
diff --git a/data/presets/presets/footway/sidewalk.json b/data/presets/presets/footway/sidewalk.json
index f51b44cf9..ac14c8a24 100644
--- a/data/presets/presets/footway/sidewalk.json
+++ b/data/presets/presets/footway/sidewalk.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-footway",
     "fields": [
+        "name",
         "surface",
         "lit",
         "width",
diff --git a/data/presets/presets/golf/bunker.json b/data/presets/presets/golf/bunker.json
index ec65e8d37..33c0020fc 100644
--- a/data/presets/presets/golf/bunker.json
+++ b/data/presets/presets/golf/bunker.json
@@ -1,5 +1,8 @@
 {
     "icon": "golf",
+    "fields": [
+        "name"
+    ],
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/golf/fairway.json b/data/presets/presets/golf/fairway.json
index a47e73632..f0ac07829 100644
--- a/data/presets/presets/golf/fairway.json
+++ b/data/presets/presets/golf/fairway.json
@@ -1,5 +1,8 @@
 {
     "icon": "golf",
+    "fields": [
+        "name"
+    ],
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/golf/green.json b/data/presets/presets/golf/green.json
index 940d0b6e9..211011092 100644
--- a/data/presets/presets/golf/green.json
+++ b/data/presets/presets/golf/green.json
@@ -1,5 +1,8 @@
 {
     "icon": "golf",
+    "fields": [
+        "name"
+    ],
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/golf/hole.json b/data/presets/presets/golf/hole.json
index 109bf42da..fbcf06626 100644
--- a/data/presets/presets/golf/hole.json
+++ b/data/presets/presets/golf/hole.json
@@ -1,7 +1,8 @@
 {
     "icon": "golf",
     "fields": [
-        "golf_hole",
+        "name",
+        "ref_golf_hole",
         "par",
         "handicap"
     ],
@@ -12,4 +13,4 @@
         "golf": "hole"
     },
     "name": "Golf Hole"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/golf/lateral_water_hazard_area.json b/data/presets/presets/golf/lateral_water_hazard_area.json
index 53d2d869c..863865e89 100644
--- a/data/presets/presets/golf/lateral_water_hazard_area.json
+++ b/data/presets/presets/golf/lateral_water_hazard_area.json
@@ -1,5 +1,8 @@
 {
     "icon": "golf",
+    "fields": [
+        "name"
+    ],
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/golf/lateral_water_hazard_line.json b/data/presets/presets/golf/lateral_water_hazard_line.json
index cced33545..7bb367e3c 100644
--- a/data/presets/presets/golf/lateral_water_hazard_line.json
+++ b/data/presets/presets/golf/lateral_water_hazard_line.json
@@ -1,5 +1,8 @@
 {
     "icon": "golf",
+    "fields": [
+        "name"
+    ],
     "geometry": [
         "line"
     ],
diff --git a/data/presets/presets/golf/rough.json b/data/presets/presets/golf/rough.json
index 23d30c88e..e50b10419 100644
--- a/data/presets/presets/golf/rough.json
+++ b/data/presets/presets/golf/rough.json
@@ -1,5 +1,8 @@
 {
     "icon": "golf",
+    "fields": [
+        "name"
+    ],
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/golf/tee.json b/data/presets/presets/golf/tee.json
index 3816c913a..7b0ccbce1 100644
--- a/data/presets/presets/golf/tee.json
+++ b/data/presets/presets/golf/tee.json
@@ -1,5 +1,8 @@
 {
     "icon": "golf",
+    "fields": [
+        "name"
+    ],
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/golf/water_hazard_area.json b/data/presets/presets/golf/water_hazard_area.json
index b6d382d33..da3ec45a2 100644
--- a/data/presets/presets/golf/water_hazard_area.json
+++ b/data/presets/presets/golf/water_hazard_area.json
@@ -1,5 +1,8 @@
 {
     "icon": "golf",
+    "fields": [
+        "name"
+    ],
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/golf/water_hazard_line.json b/data/presets/presets/golf/water_hazard_line.json
index 57afafd04..f69997f3a 100644
--- a/data/presets/presets/golf/water_hazard_line.json
+++ b/data/presets/presets/golf/water_hazard_line.json
@@ -1,5 +1,8 @@
 {
     "icon": "golf",
+    "fields": [
+        "name"
+    ],
     "geometry": [
         "line"
     ],
diff --git a/data/presets/presets/healthcare/blood_donation.json b/data/presets/presets/healthcare/blood_donation.json
index 877f3f90d..ed78004bf 100644
--- a/data/presets/presets/healthcare/blood_donation.json
+++ b/data/presets/presets/healthcare/blood_donation.json
@@ -1,6 +1,7 @@
 {
     "icon": "blood-bank",
     "fields": [
+        "name",
         "operator",
         "address",
         "blood_components",
diff --git a/data/presets/presets/highway/bridleway.json b/data/presets/presets/highway/bridleway.json
index f37224c38..1d71f10e1 100644
--- a/data/presets/presets/highway/bridleway.json
+++ b/data/presets/presets/highway/bridleway.json
@@ -1,5 +1,6 @@
 {
     "fields": [
+        "name",
         "surface",
         "width",
         "structure",
diff --git a/data/presets/presets/highway/bus_stop.json b/data/presets/presets/highway/bus_stop.json
index 19981f3e8..346e46853 100644
--- a/data/presets/presets/highway/bus_stop.json
+++ b/data/presets/presets/highway/bus_stop.json
@@ -1,6 +1,7 @@
 {
     "icon": "bus",
     "fields": [
+        "name",
         "network",
         "operator",
         "bench",
diff --git a/data/presets/presets/highway/corridor.json b/data/presets/presets/highway/corridor.json
index 040d997b5..400744430 100644
--- a/data/presets/presets/highway/corridor.json
+++ b/data/presets/presets/highway/corridor.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-footway",
     "fields": [
+        "name",
         "width",
         "level",
         "access_simple"
diff --git a/data/presets/presets/highway/crossing.json b/data/presets/presets/highway/crossing.json
index 971062c98..87613d4bd 100644
--- a/data/presets/presets/highway/crossing.json
+++ b/data/presets/presets/highway/crossing.json
@@ -1,5 +1,6 @@
 {
     "fields": [
+        "name",
         "crossing",
         "kerb",
         "tactile_paving"
diff --git a/data/presets/presets/highway/crosswalk.json b/data/presets/presets/highway/crosswalk.json
index 08dc6a3b1..787bbfb62 100644
--- a/data/presets/presets/highway/crosswalk.json
+++ b/data/presets/presets/highway/crosswalk.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-foot",
     "fields": [
+        "name",
         "crossing",
         "kerb",
         "tactile_paving"
diff --git a/data/presets/presets/highway/cycleway.json b/data/presets/presets/highway/cycleway.json
index 03ce0bc46..1c45567d1 100644
--- a/data/presets/presets/highway/cycleway.json
+++ b/data/presets/presets/highway/cycleway.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-cycleway",
     "fields": [
+        "name",
         "oneway",
         "surface",
         "lit",
diff --git a/data/presets/presets/highway/footway.json b/data/presets/presets/highway/footway.json
index 9883a4560..613d00b7a 100644
--- a/data/presets/presets/highway/footway.json
+++ b/data/presets/presets/highway/footway.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-footway",
     "fields": [
+        "name",
         "surface",
         "lit",
         "width",
@@ -8,7 +9,8 @@
         "access"
     ],
     "geometry": [
-        "line", "area"
+        "line",
+        "area"
     ],
     "terms": [
         "hike",
diff --git a/data/presets/presets/highway/living_street.json b/data/presets/presets/highway/living_street.json
index 962446eaf..52f78ce74 100644
--- a/data/presets/presets/highway/living_street.json
+++ b/data/presets/presets/highway/living_street.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-living-street",
     "fields": [
+        "name",
         "oneway",
         "maxspeed",
         "lanes",
diff --git a/data/presets/presets/highway/motorway.json b/data/presets/presets/highway/motorway.json
index 0fd862da9..f8ec07908 100644
--- a/data/presets/presets/highway/motorway.json
+++ b/data/presets/presets/highway/motorway.json
@@ -1,7 +1,8 @@
 {
     "icon": "highway-motorway",
     "fields": [
-        "ref",
+        "name",
+        "ref_road_number",
         "oneway_yes",
         "maxspeed",
         "lanes",
diff --git a/data/presets/presets/highway/motorway_junction.json b/data/presets/presets/highway/motorway_junction.json
index 7114455b7..f2f297b5b 100644
--- a/data/presets/presets/highway/motorway_junction.json
+++ b/data/presets/presets/highway/motorway_junction.json
@@ -7,7 +7,7 @@
         "highway": "motorway_junction"
     },
     "fields": [
-        "ref"
+        "ref_highway_junction"
     ],
     "name": "Motorway Junction / Exit"
 }
diff --git a/data/presets/presets/highway/motorway_link.json b/data/presets/presets/highway/motorway_link.json
index cd177dd04..141e78a1e 100644
--- a/data/presets/presets/highway/motorway_link.json
+++ b/data/presets/presets/highway/motorway_link.json
@@ -1,7 +1,8 @@
 {
     "icon": "highway-motorway-link",
     "fields": [
-        "ref",
+        "name",
+        "ref_road_number",
         "oneway_yes",
         "maxspeed",
         "lanes",
diff --git a/data/presets/presets/highway/path.json b/data/presets/presets/highway/path.json
index a38306333..dec8a8fe6 100644
--- a/data/presets/presets/highway/path.json
+++ b/data/presets/presets/highway/path.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-path",
     "fields": [
+        "name",
         "surface",
         "width",
         "structure",
diff --git a/data/presets/presets/highway/pedestrian.json b/data/presets/presets/highway/pedestrian.json
index 3fd75fda8..fece5f82b 100644
--- a/data/presets/presets/highway/pedestrian.json
+++ b/data/presets/presets/highway/pedestrian.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-footway",
     "fields": [
+        "name",
         "surface",
         "lit",
         "width",
diff --git a/data/presets/presets/highway/primary.json b/data/presets/presets/highway/primary.json
index ce9d44d0d..be3d7112f 100644
--- a/data/presets/presets/highway/primary.json
+++ b/data/presets/presets/highway/primary.json
@@ -1,13 +1,14 @@
 {
     "icon": "highway-primary",
     "fields": [
+        "name",
         "oneway",
         "maxspeed",
         "lanes",
         "surface",
         "structure",
         "maxheight",
-        "ref",
+        "ref_road_number",
         "cycleway",
         "access"
     ],
diff --git a/data/presets/presets/highway/primary_link.json b/data/presets/presets/highway/primary_link.json
index 46441c3ee..df1725340 100644
--- a/data/presets/presets/highway/primary_link.json
+++ b/data/presets/presets/highway/primary_link.json
@@ -1,12 +1,13 @@
 {
     "icon": "highway-primary-link",
     "fields": [
+        "name",
         "oneway",
         "maxspeed",
         "lanes",
         "surface",
         "maxheight",
-        "ref",
+        "ref_road_number",
         "cycleway",
         "structure",
         "access"
diff --git a/data/presets/presets/highway/raceway.json b/data/presets/presets/highway/raceway.json
index d259408b1..090995803 100644
--- a/data/presets/presets/highway/raceway.json
+++ b/data/presets/presets/highway/raceway.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-unclassified",
     "fields": [
+        "name",
         "oneway",
         "surface",
         "sport_racing_motor",
diff --git a/data/presets/presets/highway/residential.json b/data/presets/presets/highway/residential.json
index d233a6ebc..416577327 100644
--- a/data/presets/presets/highway/residential.json
+++ b/data/presets/presets/highway/residential.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-residential",
     "fields": [
+        "name",
         "oneway",
         "maxspeed",
         "lanes",
diff --git a/data/presets/presets/highway/rest_area.json b/data/presets/presets/highway/rest_area.json
index 69e808bc2..5514f2a4e 100644
--- a/data/presets/presets/highway/rest_area.json
+++ b/data/presets/presets/highway/rest_area.json
@@ -1,5 +1,8 @@
 {
     "icon": "car",
+    "fields": [
+        "name"
+    ],
     "geometry": [
         "point",
         "vertex",
diff --git a/data/presets/presets/highway/road.json b/data/presets/presets/highway/road.json
index 1213b0629..d9b1230db 100644
--- a/data/presets/presets/highway/road.json
+++ b/data/presets/presets/highway/road.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-road",
     "fields": [
+        "name",
         "oneway",
         "maxspeed",
         "lanes",
diff --git a/data/presets/presets/highway/secondary.json b/data/presets/presets/highway/secondary.json
index bfcc979c8..eb4b623b9 100644
--- a/data/presets/presets/highway/secondary.json
+++ b/data/presets/presets/highway/secondary.json
@@ -1,13 +1,14 @@
 {
     "icon": "highway-secondary",
     "fields": [
+        "name",
         "oneway",
         "maxspeed",
         "lanes",
         "surface",
         "structure",
         "maxheight",
-        "ref",
+        "ref_road_number",
         "cycleway",
         "access"
     ],
diff --git a/data/presets/presets/highway/secondary_link.json b/data/presets/presets/highway/secondary_link.json
index e488317c4..d154d9705 100644
--- a/data/presets/presets/highway/secondary_link.json
+++ b/data/presets/presets/highway/secondary_link.json
@@ -1,13 +1,14 @@
 {
     "icon": "highway-secondary-link",
     "fields": [
+        "name",
         "oneway",
         "maxspeed",
         "lanes",
         "surface",
         "structure",
         "maxheight",
-        "ref",
+        "ref_road_number",
         "cycleway",
         "access"
     ],
diff --git a/data/presets/presets/highway/service.json b/data/presets/presets/highway/service.json
index 131cf13d1..1fd17ff6e 100644
--- a/data/presets/presets/highway/service.json
+++ b/data/presets/presets/highway/service.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-service",
     "fields": [
+        "name",
         "service",
         "oneway",
         "maxspeed",
diff --git a/data/presets/presets/highway/service/alley.json b/data/presets/presets/highway/service/alley.json
index f822f46ce..a6d10ce80 100644
--- a/data/presets/presets/highway/service/alley.json
+++ b/data/presets/presets/highway/service/alley.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-service",
     "fields": [
+        "name",
         "oneway",
         "maxspeed",
         "structure",
diff --git a/data/presets/presets/highway/service/drive-through.json b/data/presets/presets/highway/service/drive-through.json
index 192760261..8dd62232b 100644
--- a/data/presets/presets/highway/service/drive-through.json
+++ b/data/presets/presets/highway/service/drive-through.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-service",
     "fields": [
+        "name",
         "oneway",
         "covered",
         "maxheight",
diff --git a/data/presets/presets/highway/service/driveway.json b/data/presets/presets/highway/service/driveway.json
index 7768f40ac..8bc00df10 100644
--- a/data/presets/presets/highway/service/driveway.json
+++ b/data/presets/presets/highway/service/driveway.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-service",
     "fields": [
+        "name",
         "oneway",
         "maxspeed",
         "structure",
diff --git a/data/presets/presets/highway/service/emergency_access.json b/data/presets/presets/highway/service/emergency_access.json
index 0f31ef0cf..8c9e750f9 100644
--- a/data/presets/presets/highway/service/emergency_access.json
+++ b/data/presets/presets/highway/service/emergency_access.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-service",
     "fields": [
+        "name",
         "oneway",
         "maxspeed",
         "structure",
diff --git a/data/presets/presets/highway/service/parking_aisle.json b/data/presets/presets/highway/service/parking_aisle.json
index d3bd27baf..1e6d54c1d 100644
--- a/data/presets/presets/highway/service/parking_aisle.json
+++ b/data/presets/presets/highway/service/parking_aisle.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-service",
     "fields": [
+        "name",
         "oneway",
         "maxspeed",
         "structure",
diff --git a/data/presets/presets/highway/services.json b/data/presets/presets/highway/services.json
index f460df847..469f9bb4f 100644
--- a/data/presets/presets/highway/services.json
+++ b/data/presets/presets/highway/services.json
@@ -1,5 +1,8 @@
 {
     "icon": "car",
+    "fields": [
+        "name"
+    ],
     "geometry": [
         "point",
         "vertex",
diff --git a/data/presets/presets/highway/tertiary.json b/data/presets/presets/highway/tertiary.json
index 0d59b112f..751b3a1c8 100644
--- a/data/presets/presets/highway/tertiary.json
+++ b/data/presets/presets/highway/tertiary.json
@@ -1,13 +1,14 @@
 {
     "icon": "highway-tertiary",
     "fields": [
+        "name",
         "oneway",
         "maxspeed",
         "lanes",
         "surface",
         "structure",
         "maxheight",
-        "ref",
+        "ref_road_number",
         "cycleway",
         "access"
     ],
diff --git a/data/presets/presets/highway/tertiary_link.json b/data/presets/presets/highway/tertiary_link.json
index d51d7908c..753ef80ed 100644
--- a/data/presets/presets/highway/tertiary_link.json
+++ b/data/presets/presets/highway/tertiary_link.json
@@ -1,13 +1,14 @@
 {
     "icon": "highway-tertiary-link",
     "fields": [
+        "name",
         "oneway",
         "maxspeed",
         "lanes",
         "surface",
         "structure",
         "maxheight",
-        "ref",
+        "ref_road_number",
         "cycleway",
         "access"
     ],
diff --git a/data/presets/presets/highway/track.json b/data/presets/presets/highway/track.json
index 50a59cb18..9e23b3341 100644
--- a/data/presets/presets/highway/track.json
+++ b/data/presets/presets/highway/track.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-track",
     "fields": [
+        "name",
         "tracktype",
         "surface",
         "width",
diff --git a/data/presets/presets/highway/trunk.json b/data/presets/presets/highway/trunk.json
index abca2464c..c18b48e2a 100644
--- a/data/presets/presets/highway/trunk.json
+++ b/data/presets/presets/highway/trunk.json
@@ -1,7 +1,8 @@
 {
     "icon": "highway-trunk",
     "fields": [
-        "ref",
+        "name",
+        "ref_road_number",
         "oneway",
         "maxspeed",
         "lanes",
diff --git a/data/presets/presets/highway/trunk_link.json b/data/presets/presets/highway/trunk_link.json
index 0533ef6f2..023cad5d3 100644
--- a/data/presets/presets/highway/trunk_link.json
+++ b/data/presets/presets/highway/trunk_link.json
@@ -1,7 +1,8 @@
 {
     "icon": "highway-trunk-link",
     "fields": [
-        "ref",
+        "name",
+        "ref_road_number",
         "oneway",
         "maxspeed",
         "lanes",
diff --git a/data/presets/presets/highway/unclassified.json b/data/presets/presets/highway/unclassified.json
index b3f31dd1e..4418b9ccc 100644
--- a/data/presets/presets/highway/unclassified.json
+++ b/data/presets/presets/highway/unclassified.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-unclassified",
     "fields": [
+        "name",
         "oneway",
         "maxspeed",
         "lanes",
diff --git a/data/presets/presets/historic/archaeological_site.json b/data/presets/presets/historic/archaeological_site.json
index 4e6cce6e1..2c6246abb 100644
--- a/data/presets/presets/historic/archaeological_site.json
+++ b/data/presets/presets/historic/archaeological_site.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-ruins",
     "fields": [
+        "name",
         "historic/civilization",
         "inscription"
     ],
diff --git a/data/presets/presets/historic/boundary_stone.json b/data/presets/presets/historic/boundary_stone.json
index b9b7e1b99..17995e544 100644
--- a/data/presets/presets/historic/boundary_stone.json
+++ b/data/presets/presets/historic/boundary_stone.json
@@ -1,6 +1,7 @@
 {
-    "icon": "monument",
+    "icon": "poi-milestone",
     "fields": [
+        "name",
         "inscription"
     ],
     "geometry": [
diff --git a/data/presets/presets/historic/castle.json b/data/presets/presets/historic/castle.json
index 882fbad5c..0d765990f 100644
--- a/data/presets/presets/historic/castle.json
+++ b/data/presets/presets/historic/castle.json
@@ -1,6 +1,7 @@
 {
     "icon": "castle",
     "fields": [
+        "name",
         "castle_type",
         "building_area",
         "historic/civilization"
diff --git a/data/presets/presets/historic/memorial.json b/data/presets/presets/historic/memorial.json
index 98e9330ce..db157cf0f 100644
--- a/data/presets/presets/historic/memorial.json
+++ b/data/presets/presets/historic/memorial.json
@@ -1,6 +1,7 @@
 {
     "icon": "monument",
     "fields": [
+        "name",
         "inscription"
     ],
     "geometry": [
diff --git a/data/presets/presets/historic/monument.json b/data/presets/presets/historic/monument.json
index 8a11cb7dd..f3487f4c3 100644
--- a/data/presets/presets/historic/monument.json
+++ b/data/presets/presets/historic/monument.json
@@ -1,6 +1,7 @@
 {
     "icon": "monument",
     "fields": [
+        "name",
         "inscription"
     ],
     "geometry": [
diff --git a/data/presets/presets/historic/ruins.json b/data/presets/presets/historic/ruins.json
index 100e104a7..c240bbce1 100644
--- a/data/presets/presets/historic/ruins.json
+++ b/data/presets/presets/historic/ruins.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-ruins",
     "fields": [
+        "name",
         "historic/civilization",
         "inscription"
     ],
diff --git a/data/presets/presets/historic/tomb.json b/data/presets/presets/historic/tomb.json
index 2d734d7c2..f30b5a44c 100644
--- a/data/presets/presets/historic/tomb.json
+++ b/data/presets/presets/historic/tomb.json
@@ -1,6 +1,7 @@
 {
     "icon": "cemetery",
     "fields": [
+        "name",
         "tomb",
         "building_area",
         "inscription"
diff --git a/data/presets/presets/historic/wayside_cross.json b/data/presets/presets/historic/wayside_cross.json
index 94f058d5c..7f379a911 100644
--- a/data/presets/presets/historic/wayside_cross.json
+++ b/data/presets/presets/historic/wayside_cross.json
@@ -1,6 +1,7 @@
 {
     "icon": "religious-christian",
     "fields": [
+        "name",
         "inscription"
     ],
     "geometry": [
diff --git a/data/presets/presets/historic/wayside_shrine.json b/data/presets/presets/historic/wayside_shrine.json
index 75b91ded9..524ee646e 100644
--- a/data/presets/presets/historic/wayside_shrine.json
+++ b/data/presets/presets/historic/wayside_shrine.json
@@ -1,6 +1,7 @@
 {
     "icon": "landmark",
     "fields": [
+        "name",
         "inscription"
     ],
     "geometry": [
diff --git a/data/presets/presets/junction.json b/data/presets/presets/junction.json
index b72def66a..d7a8e420a 100644
--- a/data/presets/presets/junction.json
+++ b/data/presets/presets/junction.json
@@ -1,5 +1,8 @@
 {
     "icon": "poi-junction",
+    "fields": [
+        "name"
+    ],
     "geometry": [
         "vertex",
         "area"
diff --git a/data/presets/presets/landuse.json b/data/presets/presets/landuse.json
index bb7e3f85e..ed6ad8233 100644
--- a/data/presets/presets/landuse.json
+++ b/data/presets/presets/landuse.json
@@ -1,5 +1,6 @@
 {
     "fields": [
+        "name",
         "landuse"
     ],
     "geometry": [
diff --git a/data/presets/presets/landuse/_farm.json b/data/presets/presets/landuse/_farm.json
index a601e5653..e2376e3db 100644
--- a/data/presets/presets/landuse/_farm.json
+++ b/data/presets/presets/landuse/_farm.json
@@ -1,6 +1,7 @@
 {
     "icon": "farm",
     "fields": [
+        "name",
         "operator",
         "crop"
     ],
diff --git a/data/presets/presets/landuse/allotments.json b/data/presets/presets/landuse/allotments.json
index daf50db27..7421b73e0 100644
--- a/data/presets/presets/landuse/allotments.json
+++ b/data/presets/presets/landuse/allotments.json
@@ -2,6 +2,9 @@
     "geometry": [
         "area"
     ],
+    "fields": [
+        "name"
+    ],
     "tags": {
         "landuse": "allotments"
     },
diff --git a/data/presets/presets/landuse/aquaculture.json b/data/presets/presets/landuse/aquaculture.json
index a3b04eed1..790a98674 100644
--- a/data/presets/presets/landuse/aquaculture.json
+++ b/data/presets/presets/landuse/aquaculture.json
@@ -1,6 +1,7 @@
 {
     "icon": "aquarium",
     "fields": [
+        "name",
         "operator",
         "produce"
     ],
diff --git a/data/presets/presets/landuse/basin.json b/data/presets/presets/landuse/basin.json
index 4b06aa119..3e72e9fbf 100644
--- a/data/presets/presets/landuse/basin.json
+++ b/data/presets/presets/landuse/basin.json
@@ -1,5 +1,8 @@
 {
     "icon": "water",
+    "fields": [
+        "name"
+    ],
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/landuse/cemetery.json b/data/presets/presets/landuse/cemetery.json
index 3ac95a358..a871796a1 100644
--- a/data/presets/presets/landuse/cemetery.json
+++ b/data/presets/presets/landuse/cemetery.json
@@ -1,6 +1,7 @@
 {
     "icon": "cemetery",
     "fields": [
+        "name",
         "religion",
         "denomination"
     ],
diff --git a/data/presets/presets/landuse/churchyard.json b/data/presets/presets/landuse/churchyard.json
index 3bd442f74..ad7ac9d90 100644
--- a/data/presets/presets/landuse/churchyard.json
+++ b/data/presets/presets/landuse/churchyard.json
@@ -1,5 +1,6 @@
 {
     "fields": [
+        "name",
         "religion",
         "denomination"
     ],
diff --git a/data/presets/presets/landuse/commercial.json b/data/presets/presets/landuse/commercial.json
index 45592cce2..ab4d5ee56 100644
--- a/data/presets/presets/landuse/commercial.json
+++ b/data/presets/presets/landuse/commercial.json
@@ -1,5 +1,8 @@
 {
     "icon": "commercial",
+    "fields": [
+        "name"
+    ],
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/landuse/construction.json b/data/presets/presets/landuse/construction.json
index 899b70383..277f6fe90 100644
--- a/data/presets/presets/landuse/construction.json
+++ b/data/presets/presets/landuse/construction.json
@@ -1,5 +1,6 @@
 {
     "fields": [
+        "name",
         "construction",
         "operator"
     ],
diff --git a/data/presets/presets/landuse/farmland.json b/data/presets/presets/landuse/farmland.json
index 372aecd32..68e8be250 100644
--- a/data/presets/presets/landuse/farmland.json
+++ b/data/presets/presets/landuse/farmland.json
@@ -1,6 +1,7 @@
 {
     "icon": "farm",
     "fields": [
+        "name",
         "operator",
         "crop",
         "produce"
diff --git a/data/presets/presets/landuse/farmyard.json b/data/presets/presets/landuse/farmyard.json
index ea885b9a1..2ae45e74b 100644
--- a/data/presets/presets/landuse/farmyard.json
+++ b/data/presets/presets/landuse/farmyard.json
@@ -1,6 +1,7 @@
 {
     "icon": "farm",
     "fields": [
+        "name",
         "operator",
         "crop"
     ],
diff --git a/data/presets/presets/landuse/forest.json b/data/presets/presets/landuse/forest.json
index e4a072017..8b3eee020 100644
--- a/data/presets/presets/landuse/forest.json
+++ b/data/presets/presets/landuse/forest.json
@@ -1,6 +1,7 @@
 {
     "icon": "park-alt1",
     "fields": [
+        "name",
         "leaf_type",
         "leaf_cycle",
         "produce"
diff --git a/data/presets/presets/landuse/garages.json b/data/presets/presets/landuse/garages.json
index c9328b015..ba5f253ab 100644
--- a/data/presets/presets/landuse/garages.json
+++ b/data/presets/presets/landuse/garages.json
@@ -2,6 +2,9 @@
     "geometry": [
         "area"
     ],
+    "fields": [
+        "name"
+    ],
     "tags": {
         "landuse": "garages"
     },
diff --git a/data/presets/presets/landuse/harbour.json b/data/presets/presets/landuse/harbour.json
index 0d647c7ef..27c898a31 100644
--- a/data/presets/presets/landuse/harbour.json
+++ b/data/presets/presets/landuse/harbour.json
@@ -1,6 +1,7 @@
 {
     "icon": "harbor",
     "fields": [
+        "name",
         "operator"
     ],
     "geometry": [
diff --git a/data/presets/presets/landuse/industrial.json b/data/presets/presets/landuse/industrial.json
index 9972d26c0..d0c2cf94c 100644
--- a/data/presets/presets/landuse/industrial.json
+++ b/data/presets/presets/landuse/industrial.json
@@ -1,5 +1,8 @@
 {
     "icon": "industry",
+    "fields": [
+        "name"
+    ],
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/landuse/landfill.json b/data/presets/presets/landuse/landfill.json
index b6cfcb1ef..f06fa9bb5 100644
--- a/data/presets/presets/landuse/landfill.json
+++ b/data/presets/presets/landuse/landfill.json
@@ -2,6 +2,9 @@
     "geometry": [
         "area"
     ],
+    "fields": [
+        "name"
+    ],
     "tags": {
         "landuse": "landfill"
     },
diff --git a/data/presets/presets/landuse/meadow.json b/data/presets/presets/landuse/meadow.json
index 3de68e377..b2f29cea1 100644
--- a/data/presets/presets/landuse/meadow.json
+++ b/data/presets/presets/landuse/meadow.json
@@ -2,6 +2,9 @@
     "geometry": [
         "area"
     ],
+    "fields": [
+        "name"
+    ],
     "tags": {
         "landuse": "meadow"
     },
diff --git a/data/presets/presets/landuse/military.json b/data/presets/presets/landuse/military.json
index 17f681451..661513dec 100644
--- a/data/presets/presets/landuse/military.json
+++ b/data/presets/presets/landuse/military.json
@@ -1,5 +1,8 @@
 {
     "icon": "poi-military",
+    "fields": [
+        "name"
+    ],
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/landuse/military/airfield.json b/data/presets/presets/landuse/military/airfield.json
index 708f40be4..f637739c7 100644
--- a/data/presets/presets/landuse/military/airfield.json
+++ b/data/presets/presets/landuse/military/airfield.json
@@ -1,7 +1,7 @@
 {
     "icon": "airfield",
     "fields": [
-        "ref",
+        "name",
         "iata",
         "icao"
     ],
diff --git a/data/presets/presets/landuse/military/barracks.json b/data/presets/presets/landuse/military/barracks.json
index b6cd840e6..aeb5aa7b1 100644
--- a/data/presets/presets/landuse/military/barracks.json
+++ b/data/presets/presets/landuse/military/barracks.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-military",
     "fields": [
+        "name",
         "building_area"
     ],
     "geometry": [
diff --git a/data/presets/presets/landuse/military/bunker.json b/data/presets/presets/landuse/military/bunker.json
index 7eb503739..b3e52d279 100644
--- a/data/presets/presets/landuse/military/bunker.json
+++ b/data/presets/presets/landuse/military/bunker.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-military",
     "fields": [
+        "name",
         "bunker_type",
         "building_area"
     ],
diff --git a/data/presets/presets/landuse/military/checkpoint.json b/data/presets/presets/landuse/military/checkpoint.json
index 05391095c..33597dcee 100644
--- a/data/presets/presets/landuse/military/checkpoint.json
+++ b/data/presets/presets/landuse/military/checkpoint.json
@@ -1,5 +1,8 @@
 {
     "icon": "barrier",
+    "fields": [
+        "name"
+    ],
     "geometry": [
         "point",
         "vertex",
diff --git a/data/presets/presets/landuse/military/danger_area.json b/data/presets/presets/landuse/military/danger_area.json
index 1734f6d74..0306ffde8 100644
--- a/data/presets/presets/landuse/military/danger_area.json
+++ b/data/presets/presets/landuse/military/danger_area.json
@@ -1,5 +1,8 @@
 {
     "icon": "danger",
+    "fields": [
+        "name"
+    ],
     "geometry": [
         "point",
         "vertex",
diff --git a/data/presets/presets/landuse/military/naval_base.json b/data/presets/presets/landuse/military/naval_base.json
index d3cc5efb1..c00fcc928 100644
--- a/data/presets/presets/landuse/military/naval_base.json
+++ b/data/presets/presets/landuse/military/naval_base.json
@@ -1,5 +1,8 @@
 {
     "icon": "poi-military",
+    "fields": [
+        "name"
+    ],
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/landuse/military/nuclear_explosion_site.json b/data/presets/presets/landuse/military/nuclear_explosion_site.json
index a3e19737e..d9d25b0b7 100644
--- a/data/presets/presets/landuse/military/nuclear_explosion_site.json
+++ b/data/presets/presets/landuse/military/nuclear_explosion_site.json
@@ -1,5 +1,8 @@
 {
     "icon": "danger",
+    "fields": [
+        "name"
+    ],
     "geometry": [
         "point",
         "vertex",
diff --git a/data/presets/presets/landuse/military/office.json b/data/presets/presets/landuse/military/office.json
index 45d3b2344..a0fc084c0 100644
--- a/data/presets/presets/landuse/military/office.json
+++ b/data/presets/presets/landuse/military/office.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-military",
     "fields": [
+        "name",
         "building_area"
     ],
     "geometry": [
diff --git a/data/presets/presets/landuse/military/range.json b/data/presets/presets/landuse/military/range.json
index 23c698fe9..023efaf51 100644
--- a/data/presets/presets/landuse/military/range.json
+++ b/data/presets/presets/landuse/military/range.json
@@ -1,5 +1,8 @@
 {
     "icon": "poi-military",
+    "fields": [
+        "name"
+    ],
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/landuse/military/training_area.json b/data/presets/presets/landuse/military/training_area.json
index e954bdfec..0acb652b3 100644
--- a/data/presets/presets/landuse/military/training_area.json
+++ b/data/presets/presets/landuse/military/training_area.json
@@ -1,5 +1,8 @@
 {
     "icon": "poi-military",
+    "fields": [
+        "name"
+    ],
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/landuse/orchard.json b/data/presets/presets/landuse/orchard.json
index a5842d79a..9898dacdc 100644
--- a/data/presets/presets/landuse/orchard.json
+++ b/data/presets/presets/landuse/orchard.json
@@ -1,6 +1,7 @@
 {
     "icon": "park-alt1",
     "fields": [
+        "name",
         "operator",
         "trees"
     ],
diff --git a/data/presets/presets/landuse/plant_nursery.json b/data/presets/presets/landuse/plant_nursery.json
index 5876ccace..17799c5d1 100644
--- a/data/presets/presets/landuse/plant_nursery.json
+++ b/data/presets/presets/landuse/plant_nursery.json
@@ -1,6 +1,7 @@
 {
     "icon": "garden",
     "fields": [
+        "name",
         "operator",
         "plant"
     ],
diff --git a/data/presets/presets/landuse/quarry.json b/data/presets/presets/landuse/quarry.json
index d58c0deda..3d1a4b6b9 100644
--- a/data/presets/presets/landuse/quarry.json
+++ b/data/presets/presets/landuse/quarry.json
@@ -2,6 +2,9 @@
     "geometry": [
         "area"
     ],
+    "fields": [
+        "name"
+    ],
     "tags": {
         "landuse": "quarry"
     },
diff --git a/data/presets/presets/landuse/recreation_ground.json b/data/presets/presets/landuse/recreation_ground.json
index 892d0eefd..1d2b55ea8 100644
--- a/data/presets/presets/landuse/recreation_ground.json
+++ b/data/presets/presets/landuse/recreation_ground.json
@@ -3,6 +3,9 @@
     "geometry": [
         "area"
     ],
+    "fields": [
+        "name"
+    ],
     "tags": {
         "landuse": "recreation_ground"
     },
diff --git a/data/presets/presets/landuse/retail.json b/data/presets/presets/landuse/retail.json
index feb32ca11..8af7e2fc5 100644
--- a/data/presets/presets/landuse/retail.json
+++ b/data/presets/presets/landuse/retail.json
@@ -3,6 +3,9 @@
     "geometry": [
         "area"
     ],
+    "fields": [
+        "name"
+    ],
     "tags": {
         "landuse": "retail"
     },
diff --git a/data/presets/presets/landuse/vineyard.json b/data/presets/presets/landuse/vineyard.json
index 4ae176a9d..40182ae63 100644
--- a/data/presets/presets/landuse/vineyard.json
+++ b/data/presets/presets/landuse/vineyard.json
@@ -1,5 +1,6 @@
 {
     "fields": [
+        "name",
         "operator",
         "grape_variety"
     ],
diff --git a/data/presets/presets/leisure.json b/data/presets/presets/leisure.json
index eefb20ee2..271cf5d3b 100644
--- a/data/presets/presets/leisure.json
+++ b/data/presets/presets/leisure.json
@@ -1,6 +1,7 @@
 {
     "icon": "pitch",
     "fields": [
+        "name",
         "leisure"
     ],
     "geometry": [
diff --git a/data/presets/presets/leisure/adult_gaming_centre.json b/data/presets/presets/leisure/adult_gaming_centre.json
index bd179d06b..c65cb9f67 100644
--- a/data/presets/presets/leisure/adult_gaming_centre.json
+++ b/data/presets/presets/leisure/adult_gaming_centre.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-dice",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/leisure/bowling_alley.json b/data/presets/presets/leisure/bowling_alley.json
index 56145eae4..63ca737c2 100644
--- a/data/presets/presets/leisure/bowling_alley.json
+++ b/data/presets/presets/leisure/bowling_alley.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-bowling",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/leisure/common.json b/data/presets/presets/leisure/common.json
index 1e7c71340..549a69860 100644
--- a/data/presets/presets/leisure/common.json
+++ b/data/presets/presets/leisure/common.json
@@ -4,6 +4,9 @@
         "point",
         "area"
     ],
+    "fields": [
+        "name"
+    ],
     "terms": [
         "open space"
     ],
diff --git a/data/presets/presets/leisure/dance.json b/data/presets/presets/leisure/dance.json
index 6269f2ca0..2a222b058 100644
--- a/data/presets/presets/leisure/dance.json
+++ b/data/presets/presets/leisure/dance.json
@@ -1,6 +1,7 @@
 {
     "icon": "music",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/leisure/dog_park.json b/data/presets/presets/leisure/dog_park.json
index 0f4e662de..949f70d89 100644
--- a/data/presets/presets/leisure/dog_park.json
+++ b/data/presets/presets/leisure/dog_park.json
@@ -4,6 +4,9 @@
         "point",
         "area"
     ],
+    "fields": [
+        "name"
+    ],
     "terms": [
     ],
     "tags": {
diff --git a/data/presets/presets/leisure/fitness_centre.json b/data/presets/presets/leisure/fitness_centre.json
index f89db6076..b8578b99b 100644
--- a/data/presets/presets/leisure/fitness_centre.json
+++ b/data/presets/presets/leisure/fitness_centre.json
@@ -1,6 +1,7 @@
 {
     "icon": "pitch",
     "fields": [
+        "name",
         "sport",
         "address",
         "building_area",
diff --git a/data/presets/presets/leisure/fitness_centre/yoga.json b/data/presets/presets/leisure/fitness_centre/yoga.json
index 4f902767a..09b07a1f5 100644
--- a/data/presets/presets/leisure/fitness_centre/yoga.json
+++ b/data/presets/presets/leisure/fitness_centre/yoga.json
@@ -1,6 +1,7 @@
 {
     "icon": "pitch",
     "fields": [
+        "name",
         "sport",
         "address",
         "building_area",
diff --git a/data/presets/presets/leisure/fitness_station.json b/data/presets/presets/leisure/fitness_station.json
index 8954ca453..0eac21dce 100644
--- a/data/presets/presets/leisure/fitness_station.json
+++ b/data/presets/presets/leisure/fitness_station.json
@@ -1,6 +1,7 @@
 {
     "icon": "pitch",
     "fields": [
+        "name",
         "sport",
         "address",
         "opening_hours"
diff --git a/data/presets/presets/leisure/garden.json b/data/presets/presets/leisure/garden.json
index c37b8048c..dd83be8f1 100644
--- a/data/presets/presets/leisure/garden.json
+++ b/data/presets/presets/leisure/garden.json
@@ -1,6 +1,7 @@
 {
     "icon": "garden",
     "fields": [
+        "name",
         "access_simple"
     ],
     "geometry": [
diff --git a/data/presets/presets/leisure/golf_course.json b/data/presets/presets/leisure/golf_course.json
index 246e545ee..d6fdb3003 100644
--- a/data/presets/presets/leisure/golf_course.json
+++ b/data/presets/presets/leisure/golf_course.json
@@ -1,6 +1,7 @@
 {
     "icon": "golf",
     "fields": [
+        "name",
         "operator",
         "address",
         "opening_hours"
diff --git a/data/presets/presets/leisure/horse_riding.json b/data/presets/presets/leisure/horse_riding.json
index 977b0c912..dc182f5f4 100644
--- a/data/presets/presets/leisure/horse_riding.json
+++ b/data/presets/presets/leisure/horse_riding.json
@@ -1,6 +1,7 @@
 {
     "icon": "horse-riding",
     "fields": [
+        "name",
         "access_simple",
         "operator",
         "address",
diff --git a/data/presets/presets/leisure/ice_rink.json b/data/presets/presets/leisure/ice_rink.json
index 1ad40197b..0db5e213e 100644
--- a/data/presets/presets/leisure/ice_rink.json
+++ b/data/presets/presets/leisure/ice_rink.json
@@ -1,6 +1,7 @@
 {
     "icon": "pitch",
     "fields": [
+        "name",
         "seasonal",
         "sport_ice",
         "operator",
diff --git a/data/presets/presets/leisure/marina.json b/data/presets/presets/leisure/marina.json
index 8ea0a5a34..690c4bdf7 100644
--- a/data/presets/presets/leisure/marina.json
+++ b/data/presets/presets/leisure/marina.json
@@ -1,6 +1,7 @@
 {
     "icon": "harbor",
     "fields": [
+        "name",
         "operator",
         "address",
         "capacity",
diff --git a/data/presets/presets/leisure/miniature_golf.json b/data/presets/presets/leisure/miniature_golf.json
index 66a4fcc70..a2b9e4bc4 100644
--- a/data/presets/presets/leisure/miniature_golf.json
+++ b/data/presets/presets/leisure/miniature_golf.json
@@ -1,6 +1,7 @@
 {
     "icon": "golf",
     "fields": [
+        "name",
         "operator",
         "address",
         "opening_hours"
diff --git a/data/presets/presets/leisure/nature_reserve.json b/data/presets/presets/leisure/nature_reserve.json
index e4a178b70..0d226cdc0 100644
--- a/data/presets/presets/leisure/nature_reserve.json
+++ b/data/presets/presets/leisure/nature_reserve.json
@@ -4,6 +4,9 @@
         "point",
         "area"
     ],
+    "fields": [
+        "name"
+    ],
     "tags": {
         "leisure": "nature_reserve"
     },
diff --git a/data/presets/presets/leisure/park.json b/data/presets/presets/leisure/park.json
index 15e40b52c..7d29b9e23 100644
--- a/data/presets/presets/leisure/park.json
+++ b/data/presets/presets/leisure/park.json
@@ -4,6 +4,9 @@
         "point",
         "area"
     ],
+    "fields": [
+        "name"
+    ],
     "terms": [
         "esplanade",
         "estate",
diff --git a/data/presets/presets/leisure/resort.json b/data/presets/presets/leisure/resort.json
index dd1010b02..ebbf04c72 100644
--- a/data/presets/presets/leisure/resort.json
+++ b/data/presets/presets/leisure/resort.json
@@ -1,6 +1,7 @@
 {
     "icon": "lodging",
     "fields": [
+        "name",
         "operator",
         "address",
         "opening_hours"
diff --git a/data/presets/presets/leisure/sports_centre.json b/data/presets/presets/leisure/sports_centre.json
index fed613c43..3c4eeffcc 100644
--- a/data/presets/presets/leisure/sports_centre.json
+++ b/data/presets/presets/leisure/sports_centre.json
@@ -1,6 +1,7 @@
 {
     "icon": "pitch",
     "fields": [
+        "name",
         "sport",
         "address",
         "building_area",
diff --git a/data/presets/presets/leisure/sports_centre/swimming.json b/data/presets/presets/leisure/sports_centre/swimming.json
index 2078e310b..6712849fe 100644
--- a/data/presets/presets/leisure/sports_centre/swimming.json
+++ b/data/presets/presets/leisure/sports_centre/swimming.json
@@ -1,6 +1,7 @@
 {
     "icon": "swimming",
     "fields": [
+        "name",
         "access_simple",
         "operator",
         "address",
diff --git a/data/presets/presets/leisure/stadium.json b/data/presets/presets/leisure/stadium.json
index a3e820695..b493f44d3 100644
--- a/data/presets/presets/leisure/stadium.json
+++ b/data/presets/presets/leisure/stadium.json
@@ -1,6 +1,7 @@
 {
     "icon": "pitch",
     "fields": [
+        "name",
         "sport",
         "address"
     ],
diff --git a/data/presets/presets/leisure/swimming_pool.json b/data/presets/presets/leisure/swimming_pool.json
index edfab8940..af6d4eb50 100644
--- a/data/presets/presets/leisure/swimming_pool.json
+++ b/data/presets/presets/leisure/swimming_pool.json
@@ -1,6 +1,7 @@
 {
     "icon": "swimming",
     "fields": [
+        "name",
         "access_simple",
         "operator",
         "address"
diff --git a/data/presets/presets/leisure/water_park.json b/data/presets/presets/leisure/water_park.json
index 15c40ab0c..10dfa90d2 100644
--- a/data/presets/presets/leisure/water_park.json
+++ b/data/presets/presets/leisure/water_park.json
@@ -1,6 +1,7 @@
 {
     "icon": "swimming",
     "fields": [
+      "name",
       "operator",
       "address"
     ],
diff --git a/data/presets/presets/line.json b/data/presets/presets/line.json
index c8995abed..47872d846 100644
--- a/data/presets/presets/line.json
+++ b/data/presets/presets/line.json
@@ -1,6 +1,9 @@
 {
     "name": "Line",
+    "fields": [
+        "name"
+    ],
     "tags": {},
     "geometry": ["line"],
     "matchScore": 0.1
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/man_made.json b/data/presets/presets/man_made.json
index 09df7cdf8..254b1b229 100644
--- a/data/presets/presets/man_made.json
+++ b/data/presets/presets/man_made.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-storage-tank",
     "fields": [
+        "name",
         "man_made"
     ],
     "geometry": [
diff --git a/data/presets/presets/man_made/pier.json b/data/presets/presets/man_made/pier.json
index dccc224bf..a9199b7a9 100644
--- a/data/presets/presets/man_made/pier.json
+++ b/data/presets/presets/man_made/pier.json
@@ -4,7 +4,8 @@
         "area"
     ],
     "terms": [
-        "dock"
+        "dock",
+        "jetty"
     ],
     "tags": {
         "man_made": "pier"
diff --git a/data/presets/presets/man_made/wastewater_plant.json b/data/presets/presets/man_made/wastewater_plant.json
index 1dec9fa58..330c074f3 100644
--- a/data/presets/presets/man_made/wastewater_plant.json
+++ b/data/presets/presets/man_made/wastewater_plant.json
@@ -1,6 +1,7 @@
 {
     "icon": "water",
     "fields": [
+	    "name",
         "operator",
         "address"
     ],
diff --git a/data/presets/presets/man_made/water_works.json b/data/presets/presets/man_made/water_works.json
index be98ac800..13e98a078 100644
--- a/data/presets/presets/man_made/water_works.json
+++ b/data/presets/presets/man_made/water_works.json
@@ -1,6 +1,7 @@
 {
     "icon": "water",
     "fields": [
+        "name",
         "operator",
         "address"
     ],
diff --git a/data/presets/presets/man_made/works.json b/data/presets/presets/man_made/works.json
index 54d41bd05..cf5254aab 100644
--- a/data/presets/presets/man_made/works.json
+++ b/data/presets/presets/man_made/works.json
@@ -1,6 +1,7 @@
 {
     "icon": "industry",
     "fields": [
+	    "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/manhole/telecom.json b/data/presets/presets/manhole/telecom.json
new file mode 100644
index 000000000..b4ab86a2d
--- /dev/null
+++ b/data/presets/presets/manhole/telecom.json
@@ -0,0 +1,23 @@
+{
+    "icon": "circle-stroked",
+    "fields": [
+        "operator",
+        "ref"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "manhole": "telecom"
+    },
+    "terms": [
+        "cover",
+        "phone",
+        "hole",
+        "telecom",
+        "telephone",
+        "bt"
+    ],
+    "name": "Telecom Manhole"
+}
diff --git a/data/presets/presets/natural.json b/data/presets/presets/natural.json
index 3554eeced..9ad9eaca1 100644
--- a/data/presets/presets/natural.json
+++ b/data/presets/presets/natural.json
@@ -1,6 +1,7 @@
 {
     "icon": "natural",
     "fields": [
+        "name",
         "natural"
     ],
     "geometry": [
diff --git a/data/presets/presets/natural/bay.json b/data/presets/presets/natural/bay.json
index db45ab42c..40429d777 100644
--- a/data/presets/presets/natural/bay.json
+++ b/data/presets/presets/natural/bay.json
@@ -4,6 +4,9 @@
         "point",
         "area"
     ],
+    "fields": [
+        "name"
+    ],
     "tags": {
         "natural": "bay"
     },
diff --git a/data/presets/presets/natural/peak.json b/data/presets/presets/natural/peak.json
index de61c6702..acd92a4ec 100644
--- a/data/presets/presets/natural/peak.json
+++ b/data/presets/presets/natural/peak.json
@@ -1,6 +1,7 @@
 {
     "icon": "mountain",
     "fields": [
+        "name",
         "elevation"
     ],
     "geometry": [
diff --git a/data/presets/presets/natural/volcano.json b/data/presets/presets/natural/volcano.json
index 09abc648c..f457970cf 100644
--- a/data/presets/presets/natural/volcano.json
+++ b/data/presets/presets/natural/volcano.json
@@ -1,6 +1,7 @@
 {
     "icon": "volcano",
     "fields": [
+        "name",
         "elevation"
     ],
     "geometry": [
diff --git a/data/presets/presets/natural/water/lake.json b/data/presets/presets/natural/water/lake.json
index e99b63e2f..a35c5c50e 100644
--- a/data/presets/presets/natural/water/lake.json
+++ b/data/presets/presets/natural/water/lake.json
@@ -3,6 +3,9 @@
     "geometry": [
         "area"
     ],
+    "fields": [
+        "name"
+    ],
     "tags": {
         "natural": "water",
         "water": "lake"
diff --git a/data/presets/presets/natural/water/pond.json b/data/presets/presets/natural/water/pond.json
index 01722060b..ef6aeaf08 100644
--- a/data/presets/presets/natural/water/pond.json
+++ b/data/presets/presets/natural/water/pond.json
@@ -3,6 +3,9 @@
     "geometry": [
         "area"
     ],
+    "fields": [
+        "name"
+    ],
     "tags": {
         "natural": "water",
         "water": "pond"
diff --git a/data/presets/presets/natural/water/reservoir.json b/data/presets/presets/natural/water/reservoir.json
index d76a05441..6fba02ecb 100644
--- a/data/presets/presets/natural/water/reservoir.json
+++ b/data/presets/presets/natural/water/reservoir.json
@@ -3,6 +3,9 @@
     "geometry": [
         "area"
     ],
+    "fields": [
+        "name"
+    ],
     "tags": {
         "natural": "water",
         "water": "reservoir"
diff --git a/data/presets/presets/office.json b/data/presets/presets/office.json
index c91fe3581..b978d9192 100644
--- a/data/presets/presets/office.json
+++ b/data/presets/presets/office.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "office",
         "address",
         "building_area",
diff --git a/data/presets/presets/office/_travel_agent.json b/data/presets/presets/office/_travel_agent.json
index d908ef926..66642b741 100644
--- a/data/presets/presets/office/_travel_agent.json
+++ b/data/presets/presets/office/_travel_agent.json
@@ -1,6 +1,7 @@
 {
     "icon": "suitcase",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/office/accountant.json b/data/presets/presets/office/accountant.json
index 515782e36..d533bd0f7 100644
--- a/data/presets/presets/office/accountant.json
+++ b/data/presets/presets/office/accountant.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/office/administrative.json b/data/presets/presets/office/administrative.json
index 52a61cf14..42c739aa7 100644
--- a/data/presets/presets/office/administrative.json
+++ b/data/presets/presets/office/administrative.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/office/architect.json b/data/presets/presets/office/architect.json
index 66473d74f..70e660c0a 100644
--- a/data/presets/presets/office/architect.json
+++ b/data/presets/presets/office/architect.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/office/company.json b/data/presets/presets/office/company.json
index b56565af0..6bb94fdb2 100644
--- a/data/presets/presets/office/company.json
+++ b/data/presets/presets/office/company.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours",
diff --git a/data/presets/presets/office/coworking.json b/data/presets/presets/office/coworking.json
index 84a3cbe28..2b96cee75 100644
--- a/data/presets/presets/office/coworking.json
+++ b/data/presets/presets/office/coworking.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours",
diff --git a/data/presets/presets/office/educational_institution.json b/data/presets/presets/office/educational_institution.json
index bb34445cb..dc634c628 100644
--- a/data/presets/presets/office/educational_institution.json
+++ b/data/presets/presets/office/educational_institution.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/office/employment_agency.json b/data/presets/presets/office/employment_agency.json
index 5e9204f9e..293f282ed 100644
--- a/data/presets/presets/office/employment_agency.json
+++ b/data/presets/presets/office/employment_agency.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/office/estate_agent.json b/data/presets/presets/office/estate_agent.json
index 117a9550f..649eeb378 100644
--- a/data/presets/presets/office/estate_agent.json
+++ b/data/presets/presets/office/estate_agent.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/office/financial.json b/data/presets/presets/office/financial.json
index 678fe38f3..d72cfca03 100644
--- a/data/presets/presets/office/financial.json
+++ b/data/presets/presets/office/financial.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/office/government.json b/data/presets/presets/office/government.json
index eb13a4a7b..6a6c32dbd 100644
--- a/data/presets/presets/office/government.json
+++ b/data/presets/presets/office/government.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/office/government/register_office.json b/data/presets/presets/office/government/register_office.json
index 9d0e72dde..d52696372 100644
--- a/data/presets/presets/office/government/register_office.json
+++ b/data/presets/presets/office/government/register_office.json
@@ -1,6 +1,7 @@
 {
     "icon": "town-hall",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours",
diff --git a/data/presets/presets/office/insurance.json b/data/presets/presets/office/insurance.json
index beb761b98..8373b69ef 100644
--- a/data/presets/presets/office/insurance.json
+++ b/data/presets/presets/office/insurance.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/office/it.json b/data/presets/presets/office/it.json
index d13df9efb..937b332e8 100644
--- a/data/presets/presets/office/it.json
+++ b/data/presets/presets/office/it.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/office/lawyer.json b/data/presets/presets/office/lawyer.json
index 438b07035..ea6b4391c 100644
--- a/data/presets/presets/office/lawyer.json
+++ b/data/presets/presets/office/lawyer.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/office/lawyer/notary.json b/data/presets/presets/office/lawyer/notary.json
index 6529ffbe2..cd65abc10 100644
--- a/data/presets/presets/office/lawyer/notary.json
+++ b/data/presets/presets/office/lawyer/notary.json
@@ -1,6 +1,7 @@
 {
     "icon": "suitcase",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/office/newspaper.json b/data/presets/presets/office/newspaper.json
index bf2201f5a..91d71e146 100644
--- a/data/presets/presets/office/newspaper.json
+++ b/data/presets/presets/office/newspaper.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/office/ngo.json b/data/presets/presets/office/ngo.json
index 74f25d926..9128f0130 100644
--- a/data/presets/presets/office/ngo.json
+++ b/data/presets/presets/office/ngo.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours",
diff --git a/data/presets/presets/office/physician.json b/data/presets/presets/office/physician.json
index db600e379..3fac3e38c 100644
--- a/data/presets/presets/office/physician.json
+++ b/data/presets/presets/office/physician.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/office/political_party.json b/data/presets/presets/office/political_party.json
index b546f3ff6..0c94c88fd 100644
--- a/data/presets/presets/office/political_party.json
+++ b/data/presets/presets/office/political_party.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/office/research.json b/data/presets/presets/office/research.json
index d03b9ed74..1a21796d9 100644
--- a/data/presets/presets/office/research.json
+++ b/data/presets/presets/office/research.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/office/telecommunication.json b/data/presets/presets/office/telecommunication.json
index 6e432eca2..ee3146448 100644
--- a/data/presets/presets/office/telecommunication.json
+++ b/data/presets/presets/office/telecommunication.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/office/therapist.json b/data/presets/presets/office/therapist.json
index c08dc4e93..337aea2b5 100644
--- a/data/presets/presets/office/therapist.json
+++ b/data/presets/presets/office/therapist.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "address",
         "building_area",
         "opening_hours"
diff --git a/data/presets/presets/piste.json b/data/presets/presets/piste.json
index 7aee2893d..33a56e0ef 100644
--- a/data/presets/presets/piste.json
+++ b/data/presets/presets/piste.json
@@ -1,6 +1,7 @@
 {
     "icon": "skiing",
     "fields": [
+        "name",
         "piste/type",
         "piste/difficulty",
         "piste/grooming",
@@ -25,4 +26,4 @@
         "piste:type": "*"
     },
     "name": "Piste/Ski Trail"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/place/_farm.json b/data/presets/presets/place/_farm.json
index 1faffa97f..f3d0c14e1 100644
--- a/data/presets/presets/place/_farm.json
+++ b/data/presets/presets/place/_farm.json
@@ -4,6 +4,9 @@
         "point",
         "area"
     ],
+    "fields": [
+        "name"
+    ],
     "tags": {
         "place": "farm"
     },
diff --git a/data/presets/presets/place/city.json b/data/presets/presets/place/city.json
index 074ac9ec2..19d3b2f4b 100644
--- a/data/presets/presets/place/city.json
+++ b/data/presets/presets/place/city.json
@@ -1,6 +1,7 @@
 {
     "icon": "city",
     "fields": [
+        "name",
         "population"
     ],
     "geometry": [
diff --git a/data/presets/presets/place/hamlet.json b/data/presets/presets/place/hamlet.json
index 8768ff0db..853c5aeff 100644
--- a/data/presets/presets/place/hamlet.json
+++ b/data/presets/presets/place/hamlet.json
@@ -1,6 +1,7 @@
 {
     "icon": "triangle-stroked",
     "fields": [
+        "name",
         "population"
     ],
     "geometry": [
diff --git a/data/presets/presets/place/island.json b/data/presets/presets/place/island.json
index 5557b65fa..b8fc8f104 100644
--- a/data/presets/presets/place/island.json
+++ b/data/presets/presets/place/island.json
@@ -4,6 +4,9 @@
         "point",
         "area"
     ],
+    "fields": [
+        "name"
+    ],
     "terms": [
         "archipelago",
         "atoll",
diff --git a/data/presets/presets/place/isolated_dwelling.json b/data/presets/presets/place/isolated_dwelling.json
index 2f1c330fe..b348005ab 100644
--- a/data/presets/presets/place/isolated_dwelling.json
+++ b/data/presets/presets/place/isolated_dwelling.json
@@ -4,6 +4,9 @@
         "point",
         "area"
     ],
+    "fields": [
+        "name"
+    ],
     "tags": {
         "place": "isolated_dwelling"
     },
diff --git a/data/presets/presets/place/locality.json b/data/presets/presets/place/locality.json
index 002695c6d..52efcbad1 100644
--- a/data/presets/presets/place/locality.json
+++ b/data/presets/presets/place/locality.json
@@ -4,6 +4,9 @@
         "point",
         "area"
     ],
+    "fields": [
+        "name"
+    ],
     "tags": {
         "place": "locality"
     },
diff --git a/data/presets/presets/place/neighbourhood.json b/data/presets/presets/place/neighbourhood.json
index c557e3f35..f474bc851 100644
--- a/data/presets/presets/place/neighbourhood.json
+++ b/data/presets/presets/place/neighbourhood.json
@@ -1,6 +1,7 @@
 {
     "icon": "triangle-stroked",
     "fields": [
+        "name",
         "population"
     ],
     "geometry": [
diff --git a/data/presets/presets/place/quarter.json b/data/presets/presets/place/quarter.json
index 73757831d..179e61c2c 100644
--- a/data/presets/presets/place/quarter.json
+++ b/data/presets/presets/place/quarter.json
@@ -1,6 +1,7 @@
 {
     "icon": "triangle-stroked",
     "fields": [
+        "name",
         "population"
     ],
     "geometry": [
diff --git a/data/presets/presets/place/square.json b/data/presets/presets/place/square.json
index 85db207d2..3e453cca9 100644
--- a/data/presets/presets/place/square.json
+++ b/data/presets/presets/place/square.json
@@ -4,6 +4,9 @@
         "point",
         "area"
     ],
+    "fields": [
+        "name"
+    ],
     "tags": {
         "place": "square"
     },
diff --git a/data/presets/presets/place/suburb.json b/data/presets/presets/place/suburb.json
index 5006f654c..e8bdb49ef 100644
--- a/data/presets/presets/place/suburb.json
+++ b/data/presets/presets/place/suburb.json
@@ -1,6 +1,7 @@
 {
     "icon": "triangle-stroked",
     "fields": [
+        "name",
         "population"
     ],
     "geometry": [
diff --git a/data/presets/presets/place/town.json b/data/presets/presets/place/town.json
index cf51bf847..ca134e635 100644
--- a/data/presets/presets/place/town.json
+++ b/data/presets/presets/place/town.json
@@ -1,6 +1,7 @@
 {
     "icon": "town",
     "fields": [
+        "name",
         "population"
     ],
     "geometry": [
diff --git a/data/presets/presets/place/village.json b/data/presets/presets/place/village.json
index c28e40903..59016ccb9 100644
--- a/data/presets/presets/place/village.json
+++ b/data/presets/presets/place/village.json
@@ -1,6 +1,7 @@
 {
     "icon": "village",
     "fields": [
+        "name",
         "population"
     ],
     "geometry": [
diff --git a/data/presets/presets/point.json b/data/presets/presets/point.json
index b4946599a..331b0d7ac 100644
--- a/data/presets/presets/point.json
+++ b/data/presets/presets/point.json
@@ -1,6 +1,9 @@
 {
     "name": "Point",
+    "fields": [
+        "name"
+    ],
     "tags": {},
     "geometry": ["point"],
     "matchScore": 0.1
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/power/plant.json b/data/presets/presets/power/plant.json
index aa6794d94..6eab0cb9c 100644
--- a/data/presets/presets/power/plant.json
+++ b/data/presets/presets/power/plant.json
@@ -1,6 +1,7 @@
 {
     "icon": "industry",
     "fields": [
+        "name",
         "operator",
         "address",
         "plant/output/electricity",
diff --git a/data/presets/presets/public_transport/platform.json b/data/presets/presets/public_transport/platform.json
index df40cd78e..5626b2557 100644
--- a/data/presets/presets/public_transport/platform.json
+++ b/data/presets/presets/public_transport/platform.json
@@ -1,7 +1,8 @@
 {
     "icon": "bus",
     "fields": [
-        "ref",
+        "name",
+        "ref_platform",
         "network",
         "operator",
         "shelter"
diff --git a/data/presets/presets/public_transport/stop_position.json b/data/presets/presets/public_transport/stop_position.json
index 1af7e19bb..cfb163244 100644
--- a/data/presets/presets/public_transport/stop_position.json
+++ b/data/presets/presets/public_transport/stop_position.json
@@ -1,7 +1,8 @@
 {
     "icon": "bus",
     "fields": [
-        "ref",
+        "name",
+        "ref_stop_position",
         "network",
         "operator"
     ],
@@ -12,4 +13,4 @@
         "public_transport": "stop_position"
     },
     "name": "Stop Position"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/railway/abandoned.json b/data/presets/presets/railway/abandoned.json
index 7a4a68e4a..80dc4dba0 100644
--- a/data/presets/presets/railway/abandoned.json
+++ b/data/presets/presets/railway/abandoned.json
@@ -7,6 +7,7 @@
         "railway": "abandoned"
     },
     "fields": [
+        "name",
         "structure",
         "service_rail"
     ],
diff --git a/data/presets/presets/railway/buffer_stop.json b/data/presets/presets/railway/buffer_stop.json
new file mode 100644
index 000000000..a0f6f8165
--- /dev/null
+++ b/data/presets/presets/railway/buffer_stop.json
@@ -0,0 +1,15 @@
+{
+    "icon": "poi-buffer-stop",
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "railway": "buffer_stop"
+    },
+    "terms": [
+        "stop",
+        "halt",
+        "buffer"
+    ],
+    "name": "Buffer Stop"
+}
diff --git a/data/presets/presets/railway/derail.json b/data/presets/presets/railway/derail.json
new file mode 100644
index 000000000..e243c20ce
--- /dev/null
+++ b/data/presets/presets/railway/derail.json
@@ -0,0 +1,13 @@
+{
+    "icon": "roadblock",
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "railway": "derail"
+    },
+    "terms": [
+        "derailer"
+    ],
+    "name": "Railway Derailer"
+}
diff --git a/data/presets/presets/railway/milestone.json b/data/presets/presets/railway/milestone.json
new file mode 100644
index 000000000..f3bd6de5e
--- /dev/null
+++ b/data/presets/presets/railway/milestone.json
@@ -0,0 +1,18 @@
+{
+    "icon": "poi-milestone",
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "fields": [
+        "milestone_position"
+    ],
+    "tags": {
+        "railway": "milestone"
+    },
+    "terms": [
+        "milestone",
+        "marker"
+    ],
+    "name": "Railway Milestone"
+}
diff --git a/data/presets/presets/railway/monorail.json b/data/presets/presets/railway/monorail.json
index b66217ce0..33a95d440 100644
--- a/data/presets/presets/railway/monorail.json
+++ b/data/presets/presets/railway/monorail.json
@@ -7,6 +7,7 @@
         "railway": "monorail"
     },
     "fields": [
+        "name",
         "structure",
         "electrified",
         "service_rail"
diff --git a/data/presets/presets/railway/narrow_gauge.json b/data/presets/presets/railway/narrow_gauge.json
index c227b00a7..a490f924b 100644
--- a/data/presets/presets/railway/narrow_gauge.json
+++ b/data/presets/presets/railway/narrow_gauge.json
@@ -7,6 +7,7 @@
         "railway": "narrow_gauge"
     },
     "fields": [
+        "name",
         "structure",
         "gauge",
         "electrified",
diff --git a/data/presets/presets/railway/platform.json b/data/presets/presets/railway/platform.json
index 5063a282d..449c221a0 100644
--- a/data/presets/presets/railway/platform.json
+++ b/data/presets/presets/railway/platform.json
@@ -1,8 +1,13 @@
 {
-    "icon": "rail",
+    "icon": "highway-footway",
+    "fields": [
+        "name",
+        "ref_platform",
+        "surface",
+        "lit",
+        "shelter"
+    ],
     "geometry": [
-        "point",
-        "vertex",
         "line",
         "area"
     ],
diff --git a/data/presets/presets/railway/rail.json b/data/presets/presets/railway/rail.json
index c385d4e9a..24ef4241a 100644
--- a/data/presets/presets/railway/rail.json
+++ b/data/presets/presets/railway/rail.json
@@ -7,6 +7,7 @@
         "railway": "rail"
     },
     "fields": [
+        "name",
         "structure",
         "gauge",
         "electrified",
diff --git a/data/presets/presets/railway/signal.json b/data/presets/presets/railway/signal.json
new file mode 100644
index 000000000..d4fe389fd
--- /dev/null
+++ b/data/presets/presets/railway/signal.json
@@ -0,0 +1,15 @@
+{
+    "icon": "poi-railway-signals",
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "railway": "signal"
+    },
+    "terms": [
+        "signal",
+        "lights"
+    ],
+    "name": "Railway Signal"
+}
diff --git a/data/presets/presets/railway/station.json b/data/presets/presets/railway/station.json
index eddb4438a..d6c868a02 100644
--- a/data/presets/presets/railway/station.json
+++ b/data/presets/presets/railway/station.json
@@ -1,6 +1,7 @@
 {
     "icon": "rail",
     "fields": [
+        "name",
         "network",
         "operator",
         "address",
diff --git a/data/presets/presets/railway/subway.json b/data/presets/presets/railway/subway.json
index abacc3ed2..60c7ca2de 100644
--- a/data/presets/presets/railway/subway.json
+++ b/data/presets/presets/railway/subway.json
@@ -7,6 +7,7 @@
         "railway": "subway"
     },
     "fields": [
+        "name",
         "structure",
         "gauge",
         "electrified",
diff --git a/data/presets/presets/railway/subway_entrance.json b/data/presets/presets/railway/subway_entrance.json
index 1b46f10d0..e723db3cc 100644
--- a/data/presets/presets/railway/subway_entrance.json
+++ b/data/presets/presets/railway/subway_entrance.json
@@ -4,6 +4,9 @@
         "point",
         "vertex"
     ],
+    "fields": [
+        "name"
+    ],
     "tags": {
         "railway": "subway_entrance"
     },
diff --git a/data/presets/presets/railway/switch.json b/data/presets/presets/railway/switch.json
new file mode 100644
index 000000000..9de580718
--- /dev/null
+++ b/data/presets/presets/railway/switch.json
@@ -0,0 +1,14 @@
+{
+    "icon": "poi-junction",
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "railway": "switch"
+    },
+    "terms": [
+        "switch",
+        "points"
+    ],
+    "name": "Railway Switch"
+}
diff --git a/data/presets/presets/railway/train_wash.json b/data/presets/presets/railway/train_wash.json
new file mode 100644
index 000000000..a5a36febd
--- /dev/null
+++ b/data/presets/presets/railway/train_wash.json
@@ -0,0 +1,20 @@
+{
+    "icon": "rail",
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "fields": [
+        "operator",
+        "building_area"
+    ],
+    "tags": {
+        "railway": "wash"
+    },
+    "terms": [
+        "wash",
+        "clean"
+    ],
+    "name": "Train Wash"
+}
diff --git a/data/presets/presets/railway/tram.json b/data/presets/presets/railway/tram.json
index ae20c35b0..19254c4d7 100644
--- a/data/presets/presets/railway/tram.json
+++ b/data/presets/presets/railway/tram.json
@@ -7,6 +7,7 @@
         "railway": "tram"
     },
     "fields": [
+        "name",
         "structure",
         "gauge",
         "electrified",
diff --git a/data/presets/presets/railway/tram_stop.json b/data/presets/presets/railway/tram_stop.json
index f01fa1cee..636c6811b 100644
--- a/data/presets/presets/railway/tram_stop.json
+++ b/data/presets/presets/railway/tram_stop.json
@@ -1,6 +1,7 @@
 {
     "icon": "rail-light",
     "fields": [
+        "name",
         "network",
         "operator"
     ],
diff --git a/data/presets/presets/relation.json b/data/presets/presets/relation.json
index 96f61c798..ca2ffd803 100644
--- a/data/presets/presets/relation.json
+++ b/data/presets/presets/relation.json
@@ -4,6 +4,7 @@
     "tags": {},
     "geometry": ["relation"],
     "fields": [
+        "name",
         "relation"
     ]
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/route/ferry.json b/data/presets/presets/route/ferry.json
index 882138d8f..696a17b28 100644
--- a/data/presets/presets/route/ferry.json
+++ b/data/presets/presets/route/ferry.json
@@ -3,6 +3,9 @@
     "geometry": [
         "line"
     ],
+    "fields": [
+        "name"
+    ],
     "tags": {
         "route": "ferry"
     },
diff --git a/data/presets/presets/shop.json b/data/presets/presets/shop.json
index d9879e230..f7a9d6bd4 100644
--- a/data/presets/presets/shop.json
+++ b/data/presets/presets/shop.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "shop",
         "operator",
         "address",
diff --git a/data/presets/presets/shop/_fishmonger.json b/data/presets/presets/shop/_fishmonger.json
index 0ba91edd1..411b23981 100644
--- a/data/presets/presets/shop/_fishmonger.json
+++ b/data/presets/presets/shop/_fishmonger.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/_vacant.json b/data/presets/presets/shop/_vacant.json
index 36329f31d..83d57e065 100644
--- a/data/presets/presets/shop/_vacant.json
+++ b/data/presets/presets/shop/_vacant.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "address",
         "building_area"
     ],
diff --git a/data/presets/presets/shop/alcohol.json b/data/presets/presets/shop/alcohol.json
index ad72ec94d..903534f8e 100644
--- a/data/presets/presets/shop/alcohol.json
+++ b/data/presets/presets/shop/alcohol.json
@@ -1,6 +1,7 @@
 {
     "icon": "alcohol-shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/anime.json b/data/presets/presets/shop/anime.json
index 8a3813256..bbb19cb61 100644
--- a/data/presets/presets/shop/anime.json
+++ b/data/presets/presets/shop/anime.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/antiques.json b/data/presets/presets/shop/antiques.json
index c8cdeab25..fe3170849 100644
--- a/data/presets/presets/shop/antiques.json
+++ b/data/presets/presets/shop/antiques.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/appliance.json b/data/presets/presets/shop/appliance.json
index e1817a2b8..aa3321b0b 100644
--- a/data/presets/presets/shop/appliance.json
+++ b/data/presets/presets/shop/appliance.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/art.json b/data/presets/presets/shop/art.json
index cc3c7a3b2..bc606392f 100644
--- a/data/presets/presets/shop/art.json
+++ b/data/presets/presets/shop/art.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "artwork_type",
         "operator",
         "address",
diff --git a/data/presets/presets/shop/baby_goods.json b/data/presets/presets/shop/baby_goods.json
index 4028f7694..059c0527d 100644
--- a/data/presets/presets/shop/baby_goods.json
+++ b/data/presets/presets/shop/baby_goods.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/bag.json b/data/presets/presets/shop/bag.json
index dc8e860f1..064ffc033 100644
--- a/data/presets/presets/shop/bag.json
+++ b/data/presets/presets/shop/bag.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/bakery.json b/data/presets/presets/shop/bakery.json
index f73eac7b7..70c41a412 100644
--- a/data/presets/presets/shop/bakery.json
+++ b/data/presets/presets/shop/bakery.json
@@ -1,6 +1,7 @@
 {
     "icon": "bakery",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/bathroom_furnishing.json b/data/presets/presets/shop/bathroom_furnishing.json
index ef8bb5eea..4751ac9bb 100644
--- a/data/presets/presets/shop/bathroom_furnishing.json
+++ b/data/presets/presets/shop/bathroom_furnishing.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/beauty.json b/data/presets/presets/shop/beauty.json
index c4a4b4195..880b9eb81 100644
--- a/data/presets/presets/shop/beauty.json
+++ b/data/presets/presets/shop/beauty.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/beauty/nails.json b/data/presets/presets/shop/beauty/nails.json
index 10bd09a77..83032a90a 100644
--- a/data/presets/presets/shop/beauty/nails.json
+++ b/data/presets/presets/shop/beauty/nails.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/beauty/tanning.json b/data/presets/presets/shop/beauty/tanning.json
index 47f5707f0..7f0755a51 100644
--- a/data/presets/presets/shop/beauty/tanning.json
+++ b/data/presets/presets/shop/beauty/tanning.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/bed.json b/data/presets/presets/shop/bed.json
index c01e992ca..177b58596 100644
--- a/data/presets/presets/shop/bed.json
+++ b/data/presets/presets/shop/bed.json
@@ -1,6 +1,7 @@
 {
     "icon": "lodging",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/beverages.json b/data/presets/presets/shop/beverages.json
index 21bf2626d..cec13c010 100644
--- a/data/presets/presets/shop/beverages.json
+++ b/data/presets/presets/shop/beverages.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/bicycle.json b/data/presets/presets/shop/bicycle.json
index 290a3f8c1..e641708b3 100644
--- a/data/presets/presets/shop/bicycle.json
+++ b/data/presets/presets/shop/bicycle.json
@@ -1,6 +1,7 @@
 {
     "icon": "bicycle",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/bookmaker.json b/data/presets/presets/shop/bookmaker.json
index 0ac43a56c..e6aa0b725 100644
--- a/data/presets/presets/shop/bookmaker.json
+++ b/data/presets/presets/shop/bookmaker.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/books.json b/data/presets/presets/shop/books.json
index 9536ec918..34b7815a4 100644
--- a/data/presets/presets/shop/books.json
+++ b/data/presets/presets/shop/books.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/boutique.json b/data/presets/presets/shop/boutique.json
index 69f63a788..42f24fdc7 100644
--- a/data/presets/presets/shop/boutique.json
+++ b/data/presets/presets/shop/boutique.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "clothes",
         "operator",
         "address",
diff --git a/data/presets/presets/shop/butcher.json b/data/presets/presets/shop/butcher.json
index ab856b4d7..19246d054 100644
--- a/data/presets/presets/shop/butcher.json
+++ b/data/presets/presets/shop/butcher.json
@@ -1,6 +1,7 @@
 {
     "icon": "slaughterhouse",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/candles.json b/data/presets/presets/shop/candles.json
index 00494564a..78ffd74e1 100644
--- a/data/presets/presets/shop/candles.json
+++ b/data/presets/presets/shop/candles.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/car.json b/data/presets/presets/shop/car.json
index 62afe054e..5bc5b10e4 100644
--- a/data/presets/presets/shop/car.json
+++ b/data/presets/presets/shop/car.json
@@ -1,6 +1,7 @@
 {
     "icon": "car",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/car_parts.json b/data/presets/presets/shop/car_parts.json
index 8809bbe9e..6629f2033 100644
--- a/data/presets/presets/shop/car_parts.json
+++ b/data/presets/presets/shop/car_parts.json
@@ -1,6 +1,7 @@
 {
     "icon": "car",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/car_repair.json b/data/presets/presets/shop/car_repair.json
index d935c6352..026476d79 100644
--- a/data/presets/presets/shop/car_repair.json
+++ b/data/presets/presets/shop/car_repair.json
@@ -1,6 +1,7 @@
 {
     "icon": "car",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/carpet.json b/data/presets/presets/shop/carpet.json
index bca50088f..6fe884bce 100644
--- a/data/presets/presets/shop/carpet.json
+++ b/data/presets/presets/shop/carpet.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/charity.json b/data/presets/presets/shop/charity.json
index d21c90e18..7ca3d463d 100644
--- a/data/presets/presets/shop/charity.json
+++ b/data/presets/presets/shop/charity.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/cheese.json b/data/presets/presets/shop/cheese.json
index 48352ba14..395ff30b5 100644
--- a/data/presets/presets/shop/cheese.json
+++ b/data/presets/presets/shop/cheese.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/chemist.json b/data/presets/presets/shop/chemist.json
index f2f710ffc..d1b68e3b4 100644
--- a/data/presets/presets/shop/chemist.json
+++ b/data/presets/presets/shop/chemist.json
@@ -1,6 +1,7 @@
 {
     "icon": "grocery",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/chocolate.json b/data/presets/presets/shop/chocolate.json
index 9edff15d2..384b24956 100644
--- a/data/presets/presets/shop/chocolate.json
+++ b/data/presets/presets/shop/chocolate.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/clothes.json b/data/presets/presets/shop/clothes.json
index 80b8968d0..19c58ba72 100644
--- a/data/presets/presets/shop/clothes.json
+++ b/data/presets/presets/shop/clothes.json
@@ -1,6 +1,7 @@
 {
     "icon": "clothing-store",
     "fields": [
+        "name",
         "clothes",
         "operator",
         "address",
diff --git a/data/presets/presets/shop/coffee.json b/data/presets/presets/shop/coffee.json
index c89096142..12678c813 100644
--- a/data/presets/presets/shop/coffee.json
+++ b/data/presets/presets/shop/coffee.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/computer.json b/data/presets/presets/shop/computer.json
index 77728fd0b..249e96f15 100644
--- a/data/presets/presets/shop/computer.json
+++ b/data/presets/presets/shop/computer.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/confectionery.json b/data/presets/presets/shop/confectionery.json
index 46cc1001e..3fbdd561b 100644
--- a/data/presets/presets/shop/confectionery.json
+++ b/data/presets/presets/shop/confectionery.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/convenience.json b/data/presets/presets/shop/convenience.json
index 7973f5e63..329463105 100644
--- a/data/presets/presets/shop/convenience.json
+++ b/data/presets/presets/shop/convenience.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/copyshop.json b/data/presets/presets/shop/copyshop.json
index 047b425be..e1837596d 100644
--- a/data/presets/presets/shop/copyshop.json
+++ b/data/presets/presets/shop/copyshop.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/cosmetics.json b/data/presets/presets/shop/cosmetics.json
index 65be932bc..18c1eca01 100644
--- a/data/presets/presets/shop/cosmetics.json
+++ b/data/presets/presets/shop/cosmetics.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/craft.json b/data/presets/presets/shop/craft.json
index 7f33c4f62..c275c3afe 100644
--- a/data/presets/presets/shop/craft.json
+++ b/data/presets/presets/shop/craft.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/curtain.json b/data/presets/presets/shop/curtain.json
index 410bcf2b0..e1a2fc7d7 100644
--- a/data/presets/presets/shop/curtain.json
+++ b/data/presets/presets/shop/curtain.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/dairy.json b/data/presets/presets/shop/dairy.json
index 7b611e34d..3ca4e8620 100644
--- a/data/presets/presets/shop/dairy.json
+++ b/data/presets/presets/shop/dairy.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/deli.json b/data/presets/presets/shop/deli.json
index 21a6e4737..4d1983e7c 100644
--- a/data/presets/presets/shop/deli.json
+++ b/data/presets/presets/shop/deli.json
@@ -1,6 +1,7 @@
 {
     "icon": "restaurant",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/department_store.json b/data/presets/presets/shop/department_store.json
index 6c8e3d09b..e7178bee9 100644
--- a/data/presets/presets/shop/department_store.json
+++ b/data/presets/presets/shop/department_store.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/doityourself.json b/data/presets/presets/shop/doityourself.json
index 1d6d7aca5..f45b78ae4 100644
--- a/data/presets/presets/shop/doityourself.json
+++ b/data/presets/presets/shop/doityourself.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/dry_cleaning.json b/data/presets/presets/shop/dry_cleaning.json
index 7e8557536..d33902092 100644
--- a/data/presets/presets/shop/dry_cleaning.json
+++ b/data/presets/presets/shop/dry_cleaning.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/e-cigarette.json b/data/presets/presets/shop/e-cigarette.json
index f1672a60d..a33ba69d1 100644
--- a/data/presets/presets/shop/e-cigarette.json
+++ b/data/presets/presets/shop/e-cigarette.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/electronics.json b/data/presets/presets/shop/electronics.json
index d475549d9..e1fc590fa 100644
--- a/data/presets/presets/shop/electronics.json
+++ b/data/presets/presets/shop/electronics.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/erotic.json b/data/presets/presets/shop/erotic.json
index 2bb2c25ff..943c511fa 100644
--- a/data/presets/presets/shop/erotic.json
+++ b/data/presets/presets/shop/erotic.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/fabric.json b/data/presets/presets/shop/fabric.json
index e038ebb67..9938e9a93 100644
--- a/data/presets/presets/shop/fabric.json
+++ b/data/presets/presets/shop/fabric.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/farm.json b/data/presets/presets/shop/farm.json
index 36649ba3d..713a75207 100644
--- a/data/presets/presets/shop/farm.json
+++ b/data/presets/presets/shop/farm.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/fashion.json b/data/presets/presets/shop/fashion.json
index 935124cc3..e9793a6e3 100644
--- a/data/presets/presets/shop/fashion.json
+++ b/data/presets/presets/shop/fashion.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "clothes",
         "operator",
         "address",
diff --git a/data/presets/presets/shop/florist.json b/data/presets/presets/shop/florist.json
index efa9a54f8..2ab61a1d8 100644
--- a/data/presets/presets/shop/florist.json
+++ b/data/presets/presets/shop/florist.json
@@ -1,6 +1,7 @@
 {
     "icon": "florist",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/frame.json b/data/presets/presets/shop/frame.json
index c1856298b..118cf773b 100644
--- a/data/presets/presets/shop/frame.json
+++ b/data/presets/presets/shop/frame.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/funeral_directors.json b/data/presets/presets/shop/funeral_directors.json
index ddb5a53e0..cb4a8dada 100644
--- a/data/presets/presets/shop/funeral_directors.json
+++ b/data/presets/presets/shop/funeral_directors.json
@@ -1,6 +1,7 @@
 {
     "icon": "cemetery",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/furnace.json b/data/presets/presets/shop/furnace.json
index eef8aae76..bf5ec8405 100644
--- a/data/presets/presets/shop/furnace.json
+++ b/data/presets/presets/shop/furnace.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/furniture.json b/data/presets/presets/shop/furniture.json
index cc6a212a0..45bd879f6 100644
--- a/data/presets/presets/shop/furniture.json
+++ b/data/presets/presets/shop/furniture.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/garden_centre.json b/data/presets/presets/shop/garden_centre.json
index 43cd8b500..f0d879991 100644
--- a/data/presets/presets/shop/garden_centre.json
+++ b/data/presets/presets/shop/garden_centre.json
@@ -1,6 +1,7 @@
 {
     "icon": "garden-center",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/gas.json b/data/presets/presets/shop/gas.json
index f7d8eb032..4562b25cd 100644
--- a/data/presets/presets/shop/gas.json
+++ b/data/presets/presets/shop/gas.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/gift.json b/data/presets/presets/shop/gift.json
index 3221ec933..a1bfa0072 100644
--- a/data/presets/presets/shop/gift.json
+++ b/data/presets/presets/shop/gift.json
@@ -1,6 +1,7 @@
 {
     "icon": "gift",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/greengrocer.json b/data/presets/presets/shop/greengrocer.json
index 8977111f3..228cc6489 100644
--- a/data/presets/presets/shop/greengrocer.json
+++ b/data/presets/presets/shop/greengrocer.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/hairdresser.json b/data/presets/presets/shop/hairdresser.json
index 91697a832..71ed03877 100644
--- a/data/presets/presets/shop/hairdresser.json
+++ b/data/presets/presets/shop/hairdresser.json
@@ -1,6 +1,7 @@
 {
     "icon": "hairdresser",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/hardware.json b/data/presets/presets/shop/hardware.json
index a9a2d6116..a11fb4d51 100644
--- a/data/presets/presets/shop/hardware.json
+++ b/data/presets/presets/shop/hardware.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/hearing_aids.json b/data/presets/presets/shop/hearing_aids.json
index e5225565b..120b94ab3 100644
--- a/data/presets/presets/shop/hearing_aids.json
+++ b/data/presets/presets/shop/hearing_aids.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/herbalist.json b/data/presets/presets/shop/herbalist.json
index 321819317..2187bed2c 100644
--- a/data/presets/presets/shop/herbalist.json
+++ b/data/presets/presets/shop/herbalist.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/hifi.json b/data/presets/presets/shop/hifi.json
index e6051314f..2b150eaa5 100644
--- a/data/presets/presets/shop/hifi.json
+++ b/data/presets/presets/shop/hifi.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/houseware.json b/data/presets/presets/shop/houseware.json
index 8bbb42d27..9531bf14c 100644
--- a/data/presets/presets/shop/houseware.json
+++ b/data/presets/presets/shop/houseware.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/interior_decoration.json b/data/presets/presets/shop/interior_decoration.json
index 1c6d49752..db61b2567 100644
--- a/data/presets/presets/shop/interior_decoration.json
+++ b/data/presets/presets/shop/interior_decoration.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/jewelry.json b/data/presets/presets/shop/jewelry.json
index 1132ff2a3..371f26ce9 100644
--- a/data/presets/presets/shop/jewelry.json
+++ b/data/presets/presets/shop/jewelry.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/kiosk.json b/data/presets/presets/shop/kiosk.json
index e9d08b8f5..ebbbb0031 100644
--- a/data/presets/presets/shop/kiosk.json
+++ b/data/presets/presets/shop/kiosk.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/kitchen.json b/data/presets/presets/shop/kitchen.json
index 1fcef9122..1c3d8aefc 100644
--- a/data/presets/presets/shop/kitchen.json
+++ b/data/presets/presets/shop/kitchen.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/laundry.json b/data/presets/presets/shop/laundry.json
index f94303634..936ada374 100644
--- a/data/presets/presets/shop/laundry.json
+++ b/data/presets/presets/shop/laundry.json
@@ -1,6 +1,7 @@
 {
     "icon": "laundry",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/leather.json b/data/presets/presets/shop/leather.json
index 1d25fa4ad..5adc70c49 100644
--- a/data/presets/presets/shop/leather.json
+++ b/data/presets/presets/shop/leather.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/locksmith.json b/data/presets/presets/shop/locksmith.json
index c6d1cd884..b0feec2f9 100644
--- a/data/presets/presets/shop/locksmith.json
+++ b/data/presets/presets/shop/locksmith.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/lottery.json b/data/presets/presets/shop/lottery.json
index 8f91ab12e..f22009c9b 100644
--- a/data/presets/presets/shop/lottery.json
+++ b/data/presets/presets/shop/lottery.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/mall.json b/data/presets/presets/shop/mall.json
index e5634a8e6..b1414e8d5 100644
--- a/data/presets/presets/shop/mall.json
+++ b/data/presets/presets/shop/mall.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/massage.json b/data/presets/presets/shop/massage.json
index d1d5ff95b..e2efdb798 100644
--- a/data/presets/presets/shop/massage.json
+++ b/data/presets/presets/shop/massage.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/medical_supply.json b/data/presets/presets/shop/medical_supply.json
index 2f608c4f1..dd31441bd 100644
--- a/data/presets/presets/shop/medical_supply.json
+++ b/data/presets/presets/shop/medical_supply.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/mobile_phone.json b/data/presets/presets/shop/mobile_phone.json
index 686f57f12..e2246c471 100644
--- a/data/presets/presets/shop/mobile_phone.json
+++ b/data/presets/presets/shop/mobile_phone.json
@@ -1,6 +1,7 @@
 {
     "icon": "mobile-phone",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/money_lender.json b/data/presets/presets/shop/money_lender.json
index defc9b3ff..8ea7d6528 100644
--- a/data/presets/presets/shop/money_lender.json
+++ b/data/presets/presets/shop/money_lender.json
@@ -1,6 +1,7 @@
 {
     "icon": "bank",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/motorcycle.json b/data/presets/presets/shop/motorcycle.json
index ad89fb537..a1d5d6a9e 100644
--- a/data/presets/presets/shop/motorcycle.json
+++ b/data/presets/presets/shop/motorcycle.json
@@ -1,6 +1,7 @@
 {
     "icon": "scooter",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/music.json b/data/presets/presets/shop/music.json
index f43d17949..b5b48747e 100644
--- a/data/presets/presets/shop/music.json
+++ b/data/presets/presets/shop/music.json
@@ -1,6 +1,7 @@
 {
     "icon": "music",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/musical_instrument.json b/data/presets/presets/shop/musical_instrument.json
index d0b819fa7..ff21c90c4 100644
--- a/data/presets/presets/shop/musical_instrument.json
+++ b/data/presets/presets/shop/musical_instrument.json
@@ -1,6 +1,7 @@
 {
     "icon": "music",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/newsagent.json b/data/presets/presets/shop/newsagent.json
index 9c0bcd287..e6de7c32d 100644
--- a/data/presets/presets/shop/newsagent.json
+++ b/data/presets/presets/shop/newsagent.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/nutrition_supplements.json b/data/presets/presets/shop/nutrition_supplements.json
index 200be2a86..bbc3d1985 100644
--- a/data/presets/presets/shop/nutrition_supplements.json
+++ b/data/presets/presets/shop/nutrition_supplements.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/optician.json b/data/presets/presets/shop/optician.json
index bf91c1a8a..577388bba 100644
--- a/data/presets/presets/shop/optician.json
+++ b/data/presets/presets/shop/optician.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/organic.json b/data/presets/presets/shop/organic.json
index 5b08915eb..85d2b535b 100644
--- a/data/presets/presets/shop/organic.json
+++ b/data/presets/presets/shop/organic.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/outdoor.json b/data/presets/presets/shop/outdoor.json
index c4f030c06..3d1cf2d70 100644
--- a/data/presets/presets/shop/outdoor.json
+++ b/data/presets/presets/shop/outdoor.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/paint.json b/data/presets/presets/shop/paint.json
index 6c211f080..971214c8a 100644
--- a/data/presets/presets/shop/paint.json
+++ b/data/presets/presets/shop/paint.json
@@ -1,6 +1,7 @@
 {
     "icon": "water",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/pastry.json b/data/presets/presets/shop/pastry.json
index a235e8746..6e62a45ba 100644
--- a/data/presets/presets/shop/pastry.json
+++ b/data/presets/presets/shop/pastry.json
@@ -1,6 +1,7 @@
 {
     "icon": "bakery",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/pawnbroker.json b/data/presets/presets/shop/pawnbroker.json
index 23be8843e..2f38fb9aa 100644
--- a/data/presets/presets/shop/pawnbroker.json
+++ b/data/presets/presets/shop/pawnbroker.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/perfumery.json b/data/presets/presets/shop/perfumery.json
index e35a19dec..3d4d8990a 100644
--- a/data/presets/presets/shop/perfumery.json
+++ b/data/presets/presets/shop/perfumery.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/pet.json b/data/presets/presets/shop/pet.json
index 4091f5d2a..d10903b60 100644
--- a/data/presets/presets/shop/pet.json
+++ b/data/presets/presets/shop/pet.json
@@ -1,6 +1,7 @@
 {
     "icon": "dog-park",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/photo.json b/data/presets/presets/shop/photo.json
index 6c09a6fd3..f76951aa7 100644
--- a/data/presets/presets/shop/photo.json
+++ b/data/presets/presets/shop/photo.json
@@ -1,6 +1,7 @@
 {
     "icon": "attraction",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/pyrotechnics.json b/data/presets/presets/shop/pyrotechnics.json
index 4de8ac50b..5ff936d6b 100644
--- a/data/presets/presets/shop/pyrotechnics.json
+++ b/data/presets/presets/shop/pyrotechnics.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/radiotechnics.json b/data/presets/presets/shop/radiotechnics.json
index f14bc8edd..ea51f414e 100644
--- a/data/presets/presets/shop/radiotechnics.json
+++ b/data/presets/presets/shop/radiotechnics.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/religion.json b/data/presets/presets/shop/religion.json
index 10c8b2bf6..ea60532f3 100644
--- a/data/presets/presets/shop/religion.json
+++ b/data/presets/presets/shop/religion.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/scuba_diving.json b/data/presets/presets/shop/scuba_diving.json
index b946ae7d6..6c09d9102 100644
--- a/data/presets/presets/shop/scuba_diving.json
+++ b/data/presets/presets/shop/scuba_diving.json
@@ -1,6 +1,7 @@
 {
     "icon": "swimming",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/seafood.json b/data/presets/presets/shop/seafood.json
index 862002492..ef6769e8f 100644
--- a/data/presets/presets/shop/seafood.json
+++ b/data/presets/presets/shop/seafood.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/second_hand.json b/data/presets/presets/shop/second_hand.json
index 3ef57239c..613c33d53 100644
--- a/data/presets/presets/shop/second_hand.json
+++ b/data/presets/presets/shop/second_hand.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/shoes.json b/data/presets/presets/shop/shoes.json
index 5e8e228cd..8e5a912ac 100644
--- a/data/presets/presets/shop/shoes.json
+++ b/data/presets/presets/shop/shoes.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/sports.json b/data/presets/presets/shop/sports.json
index b64be9105..d8e46a33b 100644
--- a/data/presets/presets/shop/sports.json
+++ b/data/presets/presets/shop/sports.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/stationery.json b/data/presets/presets/shop/stationery.json
index 982698346..be7eecb75 100644
--- a/data/presets/presets/shop/stationery.json
+++ b/data/presets/presets/shop/stationery.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/storage_rental.json b/data/presets/presets/shop/storage_rental.json
index 52dfa4919..c03506480 100644
--- a/data/presets/presets/shop/storage_rental.json
+++ b/data/presets/presets/shop/storage_rental.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building",
diff --git a/data/presets/presets/shop/supermarket.json b/data/presets/presets/shop/supermarket.json
index 05cb8039b..cf134415a 100644
--- a/data/presets/presets/shop/supermarket.json
+++ b/data/presets/presets/shop/supermarket.json
@@ -1,6 +1,7 @@
 {
     "icon": "grocery",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/tailor.json b/data/presets/presets/shop/tailor.json
index 6f0394cf1..4f4584ffb 100644
--- a/data/presets/presets/shop/tailor.json
+++ b/data/presets/presets/shop/tailor.json
@@ -1,6 +1,7 @@
 {
     "icon": "clothing-store",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/tattoo.json b/data/presets/presets/shop/tattoo.json
index e920fc058..72718b1f4 100644
--- a/data/presets/presets/shop/tattoo.json
+++ b/data/presets/presets/shop/tattoo.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/tea.json b/data/presets/presets/shop/tea.json
index 3dddcc4d3..51cc4e02c 100644
--- a/data/presets/presets/shop/tea.json
+++ b/data/presets/presets/shop/tea.json
@@ -1,6 +1,7 @@
 {
     "icon": "teahouse",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/ticket.json b/data/presets/presets/shop/ticket.json
index f7eb42290..0683c6e17 100644
--- a/data/presets/presets/shop/ticket.json
+++ b/data/presets/presets/shop/ticket.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/tobacco.json b/data/presets/presets/shop/tobacco.json
index 41a4a4f9c..5fa14b993 100644
--- a/data/presets/presets/shop/tobacco.json
+++ b/data/presets/presets/shop/tobacco.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/toys.json b/data/presets/presets/shop/toys.json
index cbe816841..f1983d2cf 100644
--- a/data/presets/presets/shop/toys.json
+++ b/data/presets/presets/shop/toys.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/travel_agency.json b/data/presets/presets/shop/travel_agency.json
index 4a6f38cc3..830e76191 100644
--- a/data/presets/presets/shop/travel_agency.json
+++ b/data/presets/presets/shop/travel_agency.json
@@ -1,6 +1,7 @@
 {
     "icon": "suitcase",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/tyres.json b/data/presets/presets/shop/tyres.json
index c0755c7b0..357fe5b7f 100644
--- a/data/presets/presets/shop/tyres.json
+++ b/data/presets/presets/shop/tyres.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/vacuum_cleaner.json b/data/presets/presets/shop/vacuum_cleaner.json
index cb06c22b1..6c4f3dac3 100644
--- a/data/presets/presets/shop/vacuum_cleaner.json
+++ b/data/presets/presets/shop/vacuum_cleaner.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/variety_store.json b/data/presets/presets/shop/variety_store.json
index eeeaf27fd..4e81923f5 100644
--- a/data/presets/presets/shop/variety_store.json
+++ b/data/presets/presets/shop/variety_store.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/video.json b/data/presets/presets/shop/video.json
index 0034b0b4b..2646e7975 100644
--- a/data/presets/presets/shop/video.json
+++ b/data/presets/presets/shop/video.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/video_games.json b/data/presets/presets/shop/video_games.json
index cbb1dbeca..8a06cfa91 100644
--- a/data/presets/presets/shop/video_games.json
+++ b/data/presets/presets/shop/video_games.json
@@ -1,6 +1,7 @@
 {
     "icon": "gaming",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/watches.json b/data/presets/presets/shop/watches.json
index c3a888b33..f2f5a876d 100644
--- a/data/presets/presets/shop/watches.json
+++ b/data/presets/presets/shop/watches.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/water_sports.json b/data/presets/presets/shop/water_sports.json
index 88cabc8de..75c6ddf4f 100644
--- a/data/presets/presets/shop/water_sports.json
+++ b/data/presets/presets/shop/water_sports.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/weapons.json b/data/presets/presets/shop/weapons.json
index 020dae4c4..a5c3b6061 100644
--- a/data/presets/presets/shop/weapons.json
+++ b/data/presets/presets/shop/weapons.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/window_blind.json b/data/presets/presets/shop/window_blind.json
index 21b9cfb50..3ed9a6494 100644
--- a/data/presets/presets/shop/window_blind.json
+++ b/data/presets/presets/shop/window_blind.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/wine.json b/data/presets/presets/shop/wine.json
index c7e527508..38b45edc6 100644
--- a/data/presets/presets/shop/wine.json
+++ b/data/presets/presets/shop/wine.json
@@ -1,6 +1,7 @@
 {
     "icon": "alcohol-shop",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/tourism.json b/data/presets/presets/tourism.json
index 2e830d6fe..e72dca6e7 100644
--- a/data/presets/presets/tourism.json
+++ b/data/presets/presets/tourism.json
@@ -1,6 +1,7 @@
 {
     "icon": "attraction",
     "fields": [
+        "name",
         "tourism"
     ],
     "geometry": [
diff --git a/data/presets/presets/tourism/alpine_hut.json b/data/presets/presets/tourism/alpine_hut.json
index 1b7effaca..1156bea70 100644
--- a/data/presets/presets/tourism/alpine_hut.json
+++ b/data/presets/presets/tourism/alpine_hut.json
@@ -1,6 +1,7 @@
 {
     "icon": "lodging",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/tourism/apartment.json b/data/presets/presets/tourism/apartment.json
index 871a02172..247c68563 100644
--- a/data/presets/presets/tourism/apartment.json
+++ b/data/presets/presets/tourism/apartment.json
@@ -1,6 +1,7 @@
 {
     "icon": "lodging",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/tourism/aquarium.json b/data/presets/presets/tourism/aquarium.json
index 8e019bb3e..2980f68ba 100644
--- a/data/presets/presets/tourism/aquarium.json
+++ b/data/presets/presets/tourism/aquarium.json
@@ -1,6 +1,7 @@
 {
     "icon": "aquarium",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/tourism/artwork.json b/data/presets/presets/tourism/artwork.json
index e4c884c62..af2377e5d 100644
--- a/data/presets/presets/tourism/artwork.json
+++ b/data/presets/presets/tourism/artwork.json
@@ -1,6 +1,7 @@
 {
     "icon": "art-gallery",
     "fields": [
+        "name",
         "artwork_type",
         "artist"
     ],
diff --git a/data/presets/presets/tourism/attraction.json b/data/presets/presets/tourism/attraction.json
index b0c650e09..431d22b50 100644
--- a/data/presets/presets/tourism/attraction.json
+++ b/data/presets/presets/tourism/attraction.json
@@ -1,6 +1,7 @@
 {
     "icon": "monument",
     "fields": [
+        "name",
         "operator",
         "address"
     ],
diff --git a/data/presets/presets/tourism/camp_site.json b/data/presets/presets/tourism/camp_site.json
index 927f2f914..03cc183a8 100644
--- a/data/presets/presets/tourism/camp_site.json
+++ b/data/presets/presets/tourism/camp_site.json
@@ -1,6 +1,7 @@
 {
     "icon": "campsite",
     "fields": [
+        "name",
         "operator",
         "address",
         "capacity",
diff --git a/data/presets/presets/tourism/caravan_site.json b/data/presets/presets/tourism/caravan_site.json
index 11d11dae0..d9921f45d 100644
--- a/data/presets/presets/tourism/caravan_site.json
+++ b/data/presets/presets/tourism/caravan_site.json
@@ -1,6 +1,7 @@
 {
     "icon": "bus",
     "fields": [
+        "name",
         "operator",
         "address",
         "capacity",
diff --git a/data/presets/presets/tourism/chalet.json b/data/presets/presets/tourism/chalet.json
index db2357f8a..41b16490a 100644
--- a/data/presets/presets/tourism/chalet.json
+++ b/data/presets/presets/tourism/chalet.json
@@ -1,6 +1,7 @@
 {
     "icon": "lodging",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/tourism/gallery.json b/data/presets/presets/tourism/gallery.json
index e0d375b6c..a08fd7ca1 100644
--- a/data/presets/presets/tourism/gallery.json
+++ b/data/presets/presets/tourism/gallery.json
@@ -1,6 +1,7 @@
 {
     "icon": "art-gallery",
     "fields": [
+        "name",
         "artwork_type",
         "operator",
         "address",
diff --git a/data/presets/presets/tourism/guest_house.json b/data/presets/presets/tourism/guest_house.json
index f2c126957..d06154720 100644
--- a/data/presets/presets/tourism/guest_house.json
+++ b/data/presets/presets/tourism/guest_house.json
@@ -1,6 +1,7 @@
 {
     "icon": "lodging",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/tourism/hostel.json b/data/presets/presets/tourism/hostel.json
index 628616e7f..cbb643f18 100644
--- a/data/presets/presets/tourism/hostel.json
+++ b/data/presets/presets/tourism/hostel.json
@@ -1,6 +1,7 @@
 {
     "icon": "lodging",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/tourism/hotel.json b/data/presets/presets/tourism/hotel.json
index 5d6592b99..b90af1c57 100644
--- a/data/presets/presets/tourism/hotel.json
+++ b/data/presets/presets/tourism/hotel.json
@@ -1,6 +1,7 @@
 {
     "icon": "lodging",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/tourism/information/board.json b/data/presets/presets/tourism/information/board.json
index 23e3c5762..40b2e504c 100644
--- a/data/presets/presets/tourism/information/board.json
+++ b/data/presets/presets/tourism/information/board.json
@@ -1,6 +1,7 @@
 {
     "icon": "information",
     "fields": [
+        "name",
         "operator",
         "board_type"
     ],
diff --git a/data/presets/presets/tourism/information/office.json b/data/presets/presets/tourism/information/office.json
index 7fb502c2b..f99077ec2 100644
--- a/data/presets/presets/tourism/information/office.json
+++ b/data/presets/presets/tourism/information/office.json
@@ -1,6 +1,7 @@
 {
     "icon": "information",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area"
diff --git a/data/presets/presets/tourism/motel.json b/data/presets/presets/tourism/motel.json
index 781e65763..391bc9aa5 100644
--- a/data/presets/presets/tourism/motel.json
+++ b/data/presets/presets/tourism/motel.json
@@ -1,6 +1,7 @@
 {
     "icon": "lodging",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/tourism/museum.json b/data/presets/presets/tourism/museum.json
index 92a17fc79..243051496 100644
--- a/data/presets/presets/tourism/museum.json
+++ b/data/presets/presets/tourism/museum.json
@@ -1,6 +1,7 @@
 {
     "icon": "museum",
     "fields": [
+        "name",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/tourism/picnic_site.json b/data/presets/presets/tourism/picnic_site.json
index 73bd5018a..f0629a9c8 100644
--- a/data/presets/presets/tourism/picnic_site.json
+++ b/data/presets/presets/tourism/picnic_site.json
@@ -1,6 +1,7 @@
 {
     "icon": "picnic-site",
     "fields": [
+        "name",
         "operator",
         "address",
         "smoking"
diff --git a/data/presets/presets/tourism/theme_park.json b/data/presets/presets/tourism/theme_park.json
index 046b197a8..4684ff3a0 100644
--- a/data/presets/presets/tourism/theme_park.json
+++ b/data/presets/presets/tourism/theme_park.json
@@ -1,6 +1,7 @@
 {
     "icon": "amusement-park",
     "fields": [
+        "name",
         "operator",
         "address",
         "opening_hours"
diff --git a/data/presets/presets/tourism/zoo.json b/data/presets/presets/tourism/zoo.json
index 46add901b..d68349d2f 100644
--- a/data/presets/presets/tourism/zoo.json
+++ b/data/presets/presets/tourism/zoo.json
@@ -1,6 +1,7 @@
 {
     "icon": "zoo",
     "fields": [
+        "name",
         "operator",
         "address",
         "opening_hours"
diff --git a/data/presets/presets/type/boundary.json b/data/presets/presets/type/boundary.json
index 5039b02f3..06a46309c 100644
--- a/data/presets/presets/type/boundary.json
+++ b/data/presets/presets/type/boundary.json
@@ -8,6 +8,7 @@
     "name": "Boundary",
     "icon": "boundary",
     "fields": [
+        "name",
         "boundary"
     ]
 }
\ No newline at end of file
diff --git a/data/presets/presets/type/boundary/administrative.json b/data/presets/presets/type/boundary/administrative.json
index 6032c71fe..2e013a2fa 100644
--- a/data/presets/presets/type/boundary/administrative.json
+++ b/data/presets/presets/type/boundary/administrative.json
@@ -1,6 +1,7 @@
 {
     "icon": "boundary",
     "fields": [
+        "name",
         "admin_level"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/restriction.json b/data/presets/presets/type/restriction.json
index 3ebf5e58a..829f15a06 100644
--- a/data/presets/presets/type/restriction.json
+++ b/data/presets/presets/type/restriction.json
@@ -8,6 +8,7 @@
     "name": "Restriction",
     "icon": "restriction",
     "fields": [
+        "name",
         "restriction",
         "except"
     ]
diff --git a/data/presets/presets/type/route.json b/data/presets/presets/type/route.json
index 73189fb5e..a139b6d8b 100644
--- a/data/presets/presets/type/route.json
+++ b/data/presets/presets/type/route.json
@@ -8,8 +8,9 @@
     "name": "Route",
     "icon": "route",
     "fields": [
+        "name",
         "route",
-        "ref",
+        "ref_route",
         "operator",
         "network"
     ]
diff --git a/data/presets/presets/type/route/bicycle.json b/data/presets/presets/type/route/bicycle.json
index 7e7ef6c5f..671784201 100644
--- a/data/presets/presets/type/route/bicycle.json
+++ b/data/presets/presets/type/route/bicycle.json
@@ -9,8 +9,9 @@
     "name": "Cycle Route",
     "icon": "route-bicycle",
     "fields": [
-        "ref",
+        "name",
+        "ref_route",
         "network_bicycle",
         "cycle_network"
     ]
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/type/route/bus.json b/data/presets/presets/type/route/bus.json
index 9bb60d561..eb64025c2 100644
--- a/data/presets/presets/type/route/bus.json
+++ b/data/presets/presets/type/route/bus.json
@@ -9,8 +9,9 @@
     "name": "Bus Route",
     "icon": "route-bus",
     "fields": [
-        "ref",
+        "name",
+        "ref_route",
         "operator",
         "network"
     ]
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/type/route/detour.json b/data/presets/presets/type/route/detour.json
index c1fced8c8..c096a31ab 100644
--- a/data/presets/presets/type/route/detour.json
+++ b/data/presets/presets/type/route/detour.json
@@ -9,6 +9,7 @@
     "name": "Detour Route",
     "icon": "route-detour",
     "fields": [
-        "ref"
+        "name",
+        "ref_route"
     ]
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/type/route/ferry.json b/data/presets/presets/type/route/ferry.json
index 99d0db0ca..3552ca5c2 100644
--- a/data/presets/presets/type/route/ferry.json
+++ b/data/presets/presets/type/route/ferry.json
@@ -9,8 +9,9 @@
     "name": "Ferry Route",
     "icon": "route-ferry",
     "fields": [
-        "ref",
+        "name",
+        "ref_route",
         "operator",
         "network"
     ]
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/type/route/foot.json b/data/presets/presets/type/route/foot.json
index 54af190f2..ff03848b5 100644
--- a/data/presets/presets/type/route/foot.json
+++ b/data/presets/presets/type/route/foot.json
@@ -9,8 +9,9 @@
     "name": "Foot Route",
     "icon": "route-foot",
     "fields": [
-        "ref",
+        "name",
+        "ref_route",
         "operator",
         "network_foot"
     ]
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/type/route/hiking.json b/data/presets/presets/type/route/hiking.json
index bb8f4e926..ae44478ff 100644
--- a/data/presets/presets/type/route/hiking.json
+++ b/data/presets/presets/type/route/hiking.json
@@ -9,7 +9,8 @@
     "name": "Hiking Route",
     "icon": "route-foot",
     "fields": [
-        "ref",
+        "name",
+        "ref_route",
         "operator",
         "network_foot"
     ]
diff --git a/data/presets/presets/type/route/horse.json b/data/presets/presets/type/route/horse.json
index 5ffe4196c..0d71d1867 100644
--- a/data/presets/presets/type/route/horse.json
+++ b/data/presets/presets/type/route/horse.json
@@ -9,7 +9,8 @@
     "name": "Riding Route",
     "icon": "route-horse",
     "fields": [
-        "ref",
+        "name",
+        "ref_route",
         "operator",
         "network_horse"
     ]
diff --git a/data/presets/presets/type/route/pipeline.json b/data/presets/presets/type/route/pipeline.json
index 0ab556c6d..7d39c3fa3 100644
--- a/data/presets/presets/type/route/pipeline.json
+++ b/data/presets/presets/type/route/pipeline.json
@@ -9,7 +9,8 @@
     "name": "Pipeline Route",
     "icon": "route-pipeline",
     "fields": [
-        "ref",
+        "name",
+        "ref_route",
         "operator"
     ]
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/type/route/power.json b/data/presets/presets/type/route/power.json
index b3f30e1d6..7014ef50c 100644
--- a/data/presets/presets/type/route/power.json
+++ b/data/presets/presets/type/route/power.json
@@ -9,7 +9,8 @@
     "name": "Power Route",
     "icon": "route-power",
     "fields": [
-        "ref",
+        "name",
+        "ref_route",
         "operator"
     ]
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/type/route/road.json b/data/presets/presets/type/route/road.json
index d9cd82a4e..ffb0cac7f 100644
--- a/data/presets/presets/type/route/road.json
+++ b/data/presets/presets/type/route/road.json
@@ -9,7 +9,8 @@
     "name": "Road Route",
     "icon": "route-road",
     "fields": [
-        "ref",
+        "name",
+        "ref_route",
         "network_road"
     ]
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/type/route/train.json b/data/presets/presets/type/route/train.json
index 5efcac78a..fa3f7e6d7 100644
--- a/data/presets/presets/type/route/train.json
+++ b/data/presets/presets/type/route/train.json
@@ -9,7 +9,8 @@
     "name": "Train Route",
     "icon": "route-train",
     "fields": [
-        "ref",
+        "name",
+        "ref_route",
         "operator",
         "network"
     ]
diff --git a/data/presets/presets/type/route/tram.json b/data/presets/presets/type/route/tram.json
index 3a466b73c..4eff2a362 100644
--- a/data/presets/presets/type/route/tram.json
+++ b/data/presets/presets/type/route/tram.json
@@ -9,7 +9,8 @@
     "name": "Tram Route",
     "icon": "route-tram",
     "fields": [
-        "ref",
+        "name",
+        "ref_route",
         "operator",
         "network"
     ]
diff --git a/data/presets/presets/type/route_master.json b/data/presets/presets/type/route_master.json
index a09abd155..223e78648 100644
--- a/data/presets/presets/type/route_master.json
+++ b/data/presets/presets/type/route_master.json
@@ -8,6 +8,7 @@
     "name": "Route Master",
     "icon": "route-master",
     "fields": [
+        "name",
         "route_master",
         "ref",
         "operator",
diff --git a/data/presets/presets/type/site.json b/data/presets/presets/type/site.json
index 1bbe58f7f..6796af70f 100644
--- a/data/presets/presets/type/site.json
+++ b/data/presets/presets/type/site.json
@@ -8,6 +8,7 @@
     "name": "Site",
     "icon": "relation",
     "fields": [
+        "name",
         "site"
     ]
 }
diff --git a/data/presets/presets/vertex.json b/data/presets/presets/vertex.json
index 6d2ea13fd..b1fd4fb81 100644
--- a/data/presets/presets/vertex.json
+++ b/data/presets/presets/vertex.json
@@ -1,6 +1,9 @@
 {
     "name": "Other",
     "tags": {},
+    "fields": [
+        "name"
+    ],
     "geometry": ["vertex"],
     "matchScore": 0.1
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/waterway/boatyard.json b/data/presets/presets/waterway/boatyard.json
index f0cb2ac69..919354792 100644
--- a/data/presets/presets/waterway/boatyard.json
+++ b/data/presets/presets/waterway/boatyard.json
@@ -1,6 +1,7 @@
 {
      "icon": "harbor",
      "fields":[
+         "name",
         "operator"
     ],
     "geometry": [
diff --git a/data/presets/presets/waterway/canal.json b/data/presets/presets/waterway/canal.json
index e1608d2b4..6cab011d8 100644
--- a/data/presets/presets/waterway/canal.json
+++ b/data/presets/presets/waterway/canal.json
@@ -1,6 +1,7 @@
 {
     "icon": "waterway-canal",
     "fields": [
+        "name",
         "width"
     ],
     "geometry": [
diff --git a/data/presets/presets/waterway/dam.json b/data/presets/presets/waterway/dam.json
index 32aabe12a..dcdf59421 100644
--- a/data/presets/presets/waterway/dam.json
+++ b/data/presets/presets/waterway/dam.json
@@ -6,6 +6,9 @@
         "line",
         "area"
     ],
+    "fields": [
+        "name"
+    ],
     "tags": {
         "waterway": "dam"
     },
diff --git a/data/presets/presets/waterway/ditch.json b/data/presets/presets/waterway/ditch.json
index 0f61421df..9373764b1 100644
--- a/data/presets/presets/waterway/ditch.json
+++ b/data/presets/presets/waterway/ditch.json
@@ -1,7 +1,7 @@
 {
     "icon": "waterway-ditch",
     "fields": [
-        "tunnel"
+        "tunnel_waterway"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/waterway/dock.json b/data/presets/presets/waterway/dock.json
index 1bf7aa7cc..029ee205c 100644
--- a/data/presets/presets/waterway/dock.json
+++ b/data/presets/presets/waterway/dock.json
@@ -1,6 +1,7 @@
 {
     "icon": "harbor",
     "fields": [
+        "name",
         "dock",
         "operator"
     ],
diff --git a/data/presets/presets/waterway/drain.json b/data/presets/presets/waterway/drain.json
index c0b72fdac..71f63d634 100644
--- a/data/presets/presets/waterway/drain.json
+++ b/data/presets/presets/waterway/drain.json
@@ -1,7 +1,7 @@
 {
     "icon": "waterway-stream",
     "fields": [
-        "tunnel"
+        "tunnel_waterway"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/waterway/fuel.json b/data/presets/presets/waterway/fuel.json
index 2fd03ede6..c9f4df505 100644
--- a/data/presets/presets/waterway/fuel.json
+++ b/data/presets/presets/waterway/fuel.json
@@ -1,6 +1,7 @@
 {
     "icon": "fuel",
     "fields": [
+        "name",
         "operator",
         "address",
         "opening_hours",
diff --git a/data/presets/presets/waterway/river.json b/data/presets/presets/waterway/river.json
index b9d1e8b3e..3125600e2 100644
--- a/data/presets/presets/waterway/river.json
+++ b/data/presets/presets/waterway/river.json
@@ -1,7 +1,8 @@
 {
     "icon": "waterway-river",
     "fields": [
-        "tunnel",
+        "name",
+        "tunnel_waterway",
         "width"
     ],
     "geometry": [
diff --git a/data/presets/presets/waterway/sanitary_dump_station.json b/data/presets/presets/waterway/sanitary_dump_station.json
index e81bbc1c8..f06773283 100644
--- a/data/presets/presets/waterway/sanitary_dump_station.json
+++ b/data/presets/presets/waterway/sanitary_dump_station.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-storage-tank",
     "fields": [
+        "name",
         "operator",
         "access_toilets",
         "fee",
diff --git a/data/presets/presets/waterway/stream.json b/data/presets/presets/waterway/stream.json
index 1a6a5f68c..802924646 100644
--- a/data/presets/presets/waterway/stream.json
+++ b/data/presets/presets/waterway/stream.json
@@ -1,7 +1,8 @@
 {
     "icon": "waterway-stream",
     "fields": [
-        "tunnel",
+        "name",
+        "tunnel_waterway",
         "width"
     ],
     "geometry": [
diff --git a/data/presets/presets/waterway/waterfall.json b/data/presets/presets/waterway/waterfall.json
index 657c3e85c..2081e6a37 100644
--- a/data/presets/presets/waterway/waterfall.json
+++ b/data/presets/presets/waterway/waterfall.json
@@ -1,6 +1,7 @@
 {
     "icon": "water",
     "fields": [
+        "name",
         "height",
         "width"
     ],
diff --git a/data/taginfo.json b/data/taginfo.json
index 613d3c122..0dfc9f114 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1812,6 +1812,10 @@
             "key": "manhole",
             "value": "drain"
         },
+        {
+            "key": "manhole",
+            "value": "telecom"
+        },
         {
             "key": "natural"
         },
@@ -2125,10 +2129,18 @@
             "key": "railway",
             "value": "abandoned"
         },
+        {
+            "key": "railway",
+            "value": "buffer_stop"
+        },
         {
             "key": "railway",
             "value": "crossing"
         },
+        {
+            "key": "railway",
+            "value": "derail"
+        },
         {
             "key": "railway",
             "value": "disused"
@@ -2145,6 +2157,10 @@
             "key": "railway",
             "value": "level_crossing"
         },
+        {
+            "key": "railway",
+            "value": "milestone"
+        },
         {
             "key": "railway",
             "value": "monorail"
@@ -2161,6 +2177,10 @@
             "key": "railway",
             "value": "rail"
         },
+        {
+            "key": "railway",
+            "value": "signal"
+        },
         {
             "key": "railway",
             "value": "station"
@@ -2173,6 +2193,14 @@
             "key": "railway",
             "value": "subway"
         },
+        {
+            "key": "railway",
+            "value": "switch"
+        },
+        {
+            "key": "railway",
+            "value": "wash"
+        },
         {
             "key": "railway",
             "value": "tram_stop"
diff --git a/dist/locales/ar.json b/dist/locales/ar.json
index a0500f2df..d93917f18 100644
--- a/dist/locales/ar.json
+++ b/dist/locales/ar.json
@@ -120,6 +120,14 @@
                 "incomplete_relation": {
                     "single": "لا يمكن حذف هذا العنصر لأنه لم يكتمل تنزيله من الإنترنت.",
                     "multiple": "لا يمكن حذف هذه العناصر لأنه لم يكتمل تنزيلها من الإنترنت."
+                },
+                "part_of_relation": {
+                    "single": "لا يمكن حذف هذا العنصر لأنه جزء من علاقة أكبر. ينبغي إزالة العنصر من العلاقة أولا.",
+                    "multiple": "لا يمكن حذف هذه العناصر لأنها جزء من علاقة أكبر. ينبغي إزالة تلك العناصر من العلاقة أولا. "
+                },
+                "connected_to_hidden": {
+                    "single": "لا يمكن حذف هذا العنصر لأنه متصل بعنصر مخفي. ",
+                    "multiple": "لا يمكن حذف هذه العناصر لأن بعضها متصل بعناصر مخفية."
                 }
             },
             "add_member": {
@@ -164,14 +172,40 @@
                 },
                 "key": "M",
                 "annotation": {
-                    "point": "نقل نقطة",
+                    "point": "حركت نقطة.",
                     "vertex": "حركت نقطة في طريق.",
-                    "line": "حرك خطاً",
-                    "area": "حرك منطقة",
+                    "line": "حركت خطًا.",
+                    "area": "حركت مساحة.",
                     "multiple": "تم تحريك عدد من العناصر."
+                },
+                "incomplete_relation": {
+                    "single": " لا يمكن تحريك هذا العنصر لأنه لم يتم تنزيله بالكامل.",
+                    "multiple": "لا يمكن تحريك هذه العناصر لأنه لم يتم تنزيلها بالكامل."
+                },
+                "too_large": {
+                    "single": " لا يمكن تحريك هذا العنصر لأنه لا يظهر منه ما يكفي حاليا.",
+                    "multiple": "لا يمكن تحريك هذه العناصر لأنه لا يظهر منها ما يكفي حاليا."
+                },
+                "connected_to_hidden": {
+                    "single": " لا يمكن تحريك هذا العنصر لأنه متصل بعنصر مخفي.",
+                    "multiple": "لا يمكن تحريك هذه العناصر لأن بعضها متصل بعناصر مخفية."
                 }
             },
             "reflect": {
+                "title": {
+                    "long": "عكس طولي",
+                    "short": "عكس عرضي"
+                },
+                "description": {
+                    "long": {
+                        "single": "عكس هذا العنصر حول محوره الطويل",
+                        "multiple": "عكس هذه العناصر حول محورها الطويل."
+                    },
+                    "short": {
+                        "single": "عكس هذا العنصر حول محوره القصير.",
+                        "multiple": "عكس هذه العناصر حول محورها القصير."
+                    }
+                },
                 "key": {
                     "long": "T",
                     "short": "Y"
@@ -179,29 +213,46 @@
             },
             "rotate": {
                 "title": "تدوير",
+                "description": {
+                    "single": "تدوير هذا العنصر حول مركزه.",
+                    "multiple": "تدوير هذه العناصر حول مركزها."
+                },
                 "key": "R",
                 "annotation": {
-                    "line": "تدوير خطا",
-                    "area": "تدوير منطقة"
+                    "line": "تدوير خط.",
+                    "area": "تدوير مساحة.",
+                    "multiple": "تدوير عدة عناصر."
+                },
+                "incomplete_relation": {
+                    "single": " لا يمكن تدوير هذا العنصر لأنه لم يتم تنزيله بالكامل.",
+                    "multiple": "لا يمكن تدوير هذه العناصر لأنه لم يكتمل تنزيلها بالكامل."
+                },
+                "too_large": {
+                    "single": "لا يمكن تدوير هذا العنصر بسبب عدم ظهور مايكفي منه حاليا.",
+                    "multiple": "لا يمكن تدوير هذه العناصر بسبب عدم ظهور مايكفي منها حاليا."
+                },
+                "connected_to_hidden": {
+                    "single": "لا يمكن تدوير هذا العنصر لأنه متصل بعنصر مخفي. ",
+                    "multiple": "لا يمكن تدوير هذه العناصر لأن بعضها متصل بعناصر مخفية."
                 }
             },
             "reverse": {
-                "title": "اعكس الاتجاه",
-                "description": "اجعل هذا الخط يذهب في الجهة المعاكسة",
+                "title": "عكس الاتجاه",
+                "description": "اجعل هذا الخط يذهب في الاتجاه المعاكس.",
                 "key": "V",
-                "annotation": "اعكس خطا"
+                "annotation": "عكس خط."
             },
             "split": {
                 "title": "فصل",
                 "description": {
-                    "line": "افصل هذا الخط إلى قسمين عند هذه النقطة.",
-                    "area": "تقسيم حدود هذه المنطقة إلى قسمين",
+                    "line": "افصل هذا الخط إلى خطين عند هذه النقطة.",
+                    "area": "تقسيم حدود هذه المساحة إلى قسمين.",
                     "multiple": "افصل الخطوط أو حدود المساحة عند هذه النقطة إلى قسمين."
                 },
                 "key": "X",
                 "annotation": {
                     "line": "افصل الخط.",
-                    "area": "افصل حدود منطقة",
+                    "area": "افصل حدود مساحة.",
                     "multiple": "افصل حدود {n} خطوط/منطقة"
                 },
                 "not_eligible": "لا يمكن فصل الخطوط عند البداية أو النهاية.",
@@ -261,7 +312,7 @@
             "upload_explanation_with_user": "التغييرات التي قمت برفعها كـ {user} سوف تظهر على كل الخرائط التي تستخدم بيانات OpenStreetMap.",
             "save": "رفع",
             "cancel": "إلغاء",
-            "changes": "{count} تغييرات",
+            "changes": "عدد التغييرات: {count}",
             "warnings": "تحذيرات",
             "modified": "عُدل",
             "deleted": "حُذفت",
@@ -430,7 +481,9 @@
         },
         "restore": {
             "heading": "لديك تعديلات غير محفوظة",
-            "description": "هل ترغب باستعادة التغييرات الغير محفوظة من جلسة التعديل السابقة؟"
+            "description": "هل ترغب باستعادة التغييرات الغير محفوظة من جلسة التعديل السابقة؟",
+            "restore": "استعادة تغييراتي",
+            "reset": "تجاهل تغييراتي"
         },
         "save": {
             "title": "حفظ",
@@ -590,14 +643,34 @@
                 "click_townhall": "جميع العناصر على الخريطة يمكن تحديدها عن طريق النقر عليها. **انقر على النقطة لتحديدها.**",
                 "selected_townhall": "رائع! ، تم تحديد النقطة. العناصر المُحددة تظهر بحد متوهج ينبض باستمرار.",
                 "editor_townhall": "عند تحديد عنصر، فإن *محرر العناصر* يظهر إلى جانب الخريطة على اليمين.",
-                "preset_townhall": "في الجزء العلوي من محرر العناصر يظهر نوع العنصر. هذه النقطة هي {preset}."
+                "preset_townhall": "في الجزء العلوي من محرر العناصر يظهر نوع العنصر. هذه النقطة هي {preset}.",
+                "fields_townhall": "الجزء الأوسط من محرر العناصر يحتوي على *حقول* تعرض صفات وخصائص العنصر المُختار، مثل اسم العنصر وعنوانه.",
+                "close_townhall": "**يمكنك غلق محرر العناصر عن طريق الضغط على مفتاح الهروب في لوحة المفاتيح \"Esc\" أو النقر على زرّ {button} في الركن العلوي من محرر العناصر.**",
+                "search_street": "يمكنك أيضا البحث عن العناصر المختلفة في العرض الحالي، أو في جميع أنحاء العالم. **ابحث عن '{name}'.**",
+                "choose_street": "**اختر {name} من القائمة لاختيارها**",
+                "selected_street": "رائع! {name} مختارة الآن.",
+                "editor_street": "الحقول التي تظهر للشارع مختلفة عن الحقول التي تظهر لمبنى البلدية.{br}لهذا الشارع المختار، فإن محرر العناصر يُظهر حقول مثل '{field1}' و '{field2}'. **أغلق محرر العناصر عن طريق الضغط على مفتاح الهروب 'Esc' من لوحة المفاتيح أو عن طريق النقر على زرّ {button}.**",
+                "play": "جرّب تحريك الخريطة وانقر على بعض العناصر الأخرى لرؤية أنواع العناصر المختلفة التي يمكن إضافتها على OpenStreetMap. **عندما تكون مستعدًا للانتقال للجزء التالي من الجولة، أنقر '{next}'.**"
             },
             "points": {
                 "title": "النقاط",
-                "undo": "يمكنك دوما التراجع عن أي تعديلات قمت بها حتى تقوم بحفظها على OpenStreetMap. **انقر على زرّ {button} للتراجع عن الحذف والبدء مجددا من نقطة سابقة.**"
+                "add_point": "يمكن استخدام *النقاط* لتمثيل المتاجر، والمطاعم، والآثار ونحو ذلك.{br}يمكنك تحديد منطقة معينة، ووصف ما يوجد بها. **انقر على زرّ  {button} لإضافة نقطة جديدة.**",
+                "place_point": "لوضع النقطة الجديدة على الخريطة، ضع مؤشر الفأرة في المكان الذي ترغب بإنشاء النقطة فيه، ثم انقر على الزرّ الأيسر للفأرة أو اضغط على مفتاح المسافة على لوحة المفاتيح. **حرّك مؤشر الفأرة حتى يكون على هذا المبنى، ثم انقر بالزرّ الأيسر للفأرة أو اضغط على مفتاح المسافة.**",
+                "search_cafe": "هناك العديد من العناصر المختلفة التي يمكن تمثيلها بالنقاط. النقطة التي اضفتها للتو عبارة عن مقهى. **ابحث عن '{preset}'.**",
+                "choose_cafe": "**اختر {preset} من القائمة.**",
+                "feature_editor": "النقطة الآن عبارة عن مقهى. باستخدام محرر العناصر، يمكنك إضافة المزيد من المعلومات عن المقهى.",
+                "add_name": "في OpenStreetMap جميع الحقول اختيارية، ولا بأس من ترك حقل ما فارغ إذا كنت غير متأكد مما سيكتب فيه.{br}دعنا نتظاهر حاليا بأنك تعرف هذا المقهى، وتعرف اسمه. **أضف اسما للمقهى.**",
+                "add_close": "محرر العناصر سيتذكّر جميع تغييراتك آليا. **عندما تنتهي من إضافة الاسم، اضغط مفتاح الهروب 'Esc'، أو مفتاح 'Enter'، أو اضغط على زرّ {button} لإغلاق محرر العناصر.**",
+                "reselect": "في كثير من الأحيان تكون النقاط موجودة مسبقا، ولكنها قد تحتوي أخطاءً أو قد تكون غير مكتملة.\nيمكنك تعديل النقاط الموجودة مسبقا. **انقر لاختيار المقهى الذي أنشأته للتو.**",
+                "update": "دعنا نملأ بعضا من التفاصيل لهذا المقهى. يمكنك تغيير اسمه، أو إضافة عنوانه، أو إضافة مشروب يقدمه هذا المقهى. **قم بتغيير بعض تفاصيل المقهى.**",
+                "update_close": "** عند انتهائك من تحديث تفاصيل المقهى، اضغط مفتاح 'Esc'، أو 'Enter'، أو اضغط زرّ {button} لإغلاق محرر العناصر.**",
+                "rightclick": "يمكنك النقر بالزر الأيمن للفأرة على أي عنصر لعرض *قائمة التحرير*، والتي تعرض قائمة من عمليات التحرير التي يمكن إجرائها على العنصر. **انقر بالزر الأيمن على النقطة التي أنشأتها وشاهد قائمة التحرير.**",
+                "delete": "لا بأس من حذف العناصر التي لا وجود لها فعليا في العالم الحقيقي.{br}حذف العناصر من OpenStreetMap يزيلها نهائيا من الخرائط التي يستخدمها الجميع. لذلك يجب عليك التأكد أن العنصر غير موجود فعليا قبل حذفه. **انقر على زرّ {button} لحذف النقطة.**",
+                "undo": "يمكنك دوما التراجع عن أي تعديلات قمت بها حتى تقوم بحفظها على OpenStreetMap. **انقر على زرّ {button} للتراجع عن الحذف والبدء مجددا من نقطة سابقة.**",
+                "play": "الآن وبعد معرفتك كيفية إنشاء وتحرير النقاط، حاول إنشاء بعض النقاط الأخرى وتحريرها لغرض التمرين! ** عندما تكون جاهز للمتابعة إلى الجزء التالي من الجولة انقر '{next}'.**"
             },
             "areas": {
-                "title": "المناطق"
+                "title": "المساحات"
             },
             "lines": {
                 "title": "الخطوط",
@@ -615,15 +688,42 @@
         "shortcuts": {
             "title": "اختصارات لوحة المفاتيح",
             "tooltip": "عرض شاشة اختصارات لوحة المفاتيح",
+            "key": {
+                "home": "الرئيسية",
+                "return": "رجوع"
+            },
+            "gesture": {
+                "drag": "سحب"
+            },
             "browsing": {
                 "help": {
+                    "title": "المساعدة",
                     "keyboard": "عرض اختصارات لوحة المفاتيح"
                 }
             },
             "editing": {
+                "title": "تحرير",
+                "drawing": {
+                    "title": "رسم",
+                    "place_point": "أضف نقطة"
+                },
+                "operations": {
+                    "title": "عمليات",
+                    "reverse": "عكس الخط",
+                    "delete": "حذف الميزات المحددة"
+                },
                 "commands": {
+                    "title": "الأوامر",
                     "save": "حفظ التغييرات"
                 }
+            },
+            "tools": {
+                "title": "أدوات",
+                "info": {
+                    "history": "تبديل لوحة السجل",
+                    "location": "تبديل لوحة الموقع",
+                    "measurement": "تبديل لوحة القياس"
+                }
             }
         },
         "presets": {
@@ -866,7 +966,11 @@
                     "label": "حامل كاميرا"
                 },
                 "camera/type": {
-                    "label": "نوع الكاميرا"
+                    "label": "نوع الكاميرا",
+                    "options": {
+                        "dome": "قبة",
+                        "fixed": "ثابت"
+                    }
                 },
                 "capacity": {
                     "label": "السعة",
@@ -919,9 +1023,6 @@
                     "label": "رابط كاميرا الويب",
                     "placeholder": "http://example.com"
                 },
-                "content": {
-                    "label": "المحتويات"
-                },
                 "country": {
                     "label": "الدولة"
                 },
@@ -971,8 +1072,12 @@
                         "shared_lane": {
                             "description": "مسار دراجات غير مفصول عن حركة مرور السيارات",
                             "title": "مسار دراجات مشترك"
+                        },
+                        "track": {
+                            "title": "مسار الدراجة"
                         }
                     },
+                    "placeholder": "لا شيء",
                     "types": {
                         "cycleway:left": "جانب أيسر",
                         "cycleway:right": "جانب أيمن"
@@ -993,6 +1098,9 @@
                 "description": {
                     "label": "الوصف"
                 },
+                "display": {
+                    "label": "عرض"
+                },
                 "dock": {
                     "label": "النوع"
                 },
@@ -1036,7 +1144,9 @@
                     "label": "النوع"
                 },
                 "fire_hydrant/position": {
+                    "label": "موضع",
                     "options": {
+                        "green": "أخضر",
                         "lane": "حارة طريق",
                         "parking_lot": "ساحة وقوف سيارات",
                         "sidewalk": "رصيف"
@@ -1137,6 +1247,9 @@
                 "internet_access/fee": {
                     "label": "رسوم استخدام خدمة الإنترنت"
                 },
+                "label": {
+                    "label": "وسم"
+                },
                 "lamp_type": {
                     "label": "النوع"
                 },
@@ -1204,7 +1317,8 @@
                     "label": "النوع"
                 },
                 "maxheight": {
-                    "label": "أقصى ارتفاع"
+                    "label": "أقصى ارتفاع",
+                    "placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\""
                 },
                 "maxspeed": {
                     "label": "حدود السرعة",
@@ -1213,6 +1327,9 @@
                 "maxweight": {
                     "label": "أقصى وزن"
                 },
+                "mtb/scale": {
+                    "placeholder": "0, 1, 2, 3..."
+                },
                 "mtb/scale/imba": {
                     "options": {
                         "1": "سهل (دائرة خضراء)"
@@ -1242,10 +1359,24 @@
                     }
                 },
                 "network_foot": {
-                    "label": "نوع الشبكة"
+                    "label": "نوع الشبكة",
+                    "options": {
+                        "iwn": "دولي",
+                        "lwn": "محلي",
+                        "nwn": "وطني",
+                        "rwn": "إقليمي"
+                    },
+                    "placeholder": "محلي، إقليمي، وطني، دولي"
                 },
                 "network_horse": {
-                    "label": "نوع الشبكة"
+                    "label": "نوع الشبكة",
+                    "options": {
+                        "ihn": "دولي",
+                        "lhn": "محلي",
+                        "nhn": "وطني",
+                        "rhn": "إقليمي"
+                    },
+                    "placeholder": "محلي، إقليمي، وطني، دولي"
                 },
                 "network_road": {
                     "label": "الشبكة"
@@ -1999,6 +2130,10 @@
                     "name": "منظم حفلات",
                     "terms": "منظم حفلات; متعهد حفلات;حفلة;حفلات"
                 },
+                "craft/electrician": {
+                    "name": "كهربائي",
+                    "terms": "كهربائي"
+                },
                 "craft/gardener": {
                     "name": "بستاني"
                 },
@@ -2162,6 +2297,9 @@
                     "name": "منطقة خدمة",
                     "terms": "خدمة سيارات; منطقة خدمة سيارات; منطقة خدمية"
                 },
+                "highway/speed_camera": {
+                    "name": "كاميرا مراقبة"
+                },
                 "highway/steps": {
                     "name": "درج",
                     "terms": "درج"
@@ -2434,6 +2572,10 @@
                     "name": "حوض سباحة",
                     "terms": "حمام سباحة; حوض سباحة; حمام; حوض; سباحة; مسبح"
                 },
+                "leisure/water_park": {
+                    "name": "ملاهي مائية",
+                    "terms": "ملاهي مائية"
+                },
                 "line": {
                     "name": "طريق",
                     "terms": "طريق"
@@ -2450,6 +2592,10 @@
                     "name": "كاسر الأمواج",
                     "terms": "كاسر الأمواج"
                 },
+                "man_made/bridge": {
+                    "name": "جسر",
+                    "terms": "جسر"
+                },
                 "man_made/chimney": {
                     "name": "مدخنة"
                 },
@@ -2515,6 +2661,10 @@
                     "name": "محطة مياه",
                     "terms": "محطة مياه"
                 },
+                "man_made/works": {
+                    "name": "مصنع",
+                    "terms": "مصنع"
+                },
                 "natural": {
                     "name": "طبيعي",
                     "terms": "طبيعي"
@@ -2612,6 +2762,10 @@
                     "name": "غابة أخشاب",
                     "terms": "غابة أخشاب"
                 },
+                "noexit/yes": {
+                    "name": "لا يوجد مخرج",
+                    "terms": "لا يوجد مخرج"
+                },
                 "office": {
                     "name": "مكتب",
                     "terms": "مكتب"
@@ -3048,6 +3202,10 @@
                     "name": "محل بيع وتأجير الأفلام",
                     "terms": "محل بيع وتأجير الأفلام"
                 },
+                "shop/video_games": {
+                    "name": "متجر العاب الفيديو",
+                    "terms": "متجر العاب الفيديو"
+                },
                 "shop/weapons": {
                     "name": "متجر أسلحة"
                 },
@@ -3149,6 +3307,22 @@
                     "name": "قيود",
                     "terms": "قيود"
                 },
+                "type/restriction/no_u_turn": {
+                    "name": "لا يوجد دوران",
+                    "terms": "لا يوجد دوران"
+                },
+                "type/restriction/only_left_turn": {
+                    "name": "منعطف لليسار فقط",
+                    "terms": "منعطف لليسار فقط"
+                },
+                "type/restriction/only_right_turn": {
+                    "name": "منعطف لليمين فقط",
+                    "terms": "منعطف لليمين فقط"
+                },
+                "type/restriction/only_straight_on": {
+                    "name": "لا يوجد منعطفات",
+                    "terms": "لا يوجد منعطفات"
+                },
                 "type/route": {
                     "name": "مسار",
                     "terms": "مسار"
@@ -3205,6 +3379,10 @@
                     "name": "مسار رئيسي",
                     "terms": "مسار رئيسي"
                 },
+                "type/site": {
+                    "name": "موقع",
+                    "terms": "موقع"
+                },
                 "vertex": {
                     "name": "أخرى",
                     "terms": "أخرى"
@@ -3212,6 +3390,10 @@
                 "waterway": {
                     "name": "مجرى مائي"
                 },
+                "waterway/boatyard": {
+                    "name": "ساحة بناء المراكب",
+                    "terms": "ساحة بناء المراكب"
+                },
                 "waterway/canal": {
                     "name": "قناة",
                     "terms": "قناة"
@@ -3224,6 +3406,10 @@
                     "name": "خندق",
                     "terms": "خندق"
                 },
+                "waterway/dock": {
+                    "name": "رصيف بحري رطب/رصيف بحري جاف",
+                    "terms": "رصيف بحري رطب/رصيف بحري جاف"
+                },
                 "waterway/drain": {
                     "name": "مصرف مياه",
                     "terms": "مصرف مياه"
@@ -3238,18 +3424,27 @@
                 },
                 "waterway/riverbank": {
                     "name": "ضفة نهر",
-                    "terms": "شاطيء نهر"
+                    "terms": "ضفة النهر"
+                },
+                "waterway/sanitary_dump_station": {
+                    "name": "التخلص من مرحاض البحر",
+                    "terms": "التخلص من مرحاض البحر"
                 },
                 "waterway/stream": {
                     "name": "مجرى",
                     "terms": "مجرى"
                 },
+                "waterway/water_point": {
+                    "name": "مياه الشرب البحرية",
+                    "terms": "مياه الشرب البحرية"
+                },
                 "waterway/waterfall": {
-                    "name": "شلال"
+                    "name": "شلال",
+                    "terms": "شلال"
                 },
                 "waterway/weir": {
-                    "name": "هدار سد صغير",
-                    "terms": "هدار سد صغير"
+                    "name": "سد",
+                    "terms": "سد"
                 }
             }
         },
@@ -3335,6 +3530,16 @@
             },
             "stamen-terrain-background": {
                 "name": "ستامن تيرين"
+            },
+            "tf-cycle": {
+                "attribution": {
+                    "text": "Maps © Thunderforest, Data © OpenStreetMap contributors"
+                }
+            },
+            "tf-landscape": {
+                "attribution": {
+                    "text": "Maps © Thunderforest, Data © OpenStreetMap contributors"
+                }
             }
         }
     }
diff --git a/dist/locales/ast.json b/dist/locales/ast.json
index 26b42d2a9..e257235d6 100644
--- a/dist/locales/ast.json
+++ b/dist/locales/ast.json
@@ -907,9 +907,6 @@
                 "construction": {
                     "label": "Tipu"
                 },
-                "content": {
-                    "label": "Conteníu"
-                },
                 "country": {
                     "label": "País"
                 },
diff --git a/dist/locales/ca.json b/dist/locales/ca.json
index ec6856ad6..bbcd6ff1a 100644
--- a/dist/locales/ca.json
+++ b/dist/locales/ca.json
@@ -1064,9 +1064,6 @@
                     "label": "URL de la webcam",
                     "placeholder": "http://example.com/"
                 },
-                "content": {
-                    "label": "Continguts"
-                },
                 "country": {
                     "label": "País"
                 },
diff --git a/dist/locales/cs.json b/dist/locales/cs.json
index 18175d077..8576031d9 100644
--- a/dist/locales/cs.json
+++ b/dist/locales/cs.json
@@ -1216,9 +1216,6 @@
                     "label": "URL webkamery",
                     "placeholder": "http://priklad.cz/"
                 },
-                "content": {
-                    "label": "Obsah"
-                },
                 "country": {
                     "label": "Stát"
                 },
diff --git a/dist/locales/da.json b/dist/locales/da.json
index 625e2049c..b9b3a9b8a 100644
--- a/dist/locales/da.json
+++ b/dist/locales/da.json
@@ -1184,9 +1184,6 @@
                     "label": "Webcam-URL",
                     "placeholder": "http://example.com/"
                 },
-                "content": {
-                    "label": "Indhold"
-                },
                 "country": {
                     "label": "Land"
                 },
diff --git a/dist/locales/de.json b/dist/locales/de.json
index bac44ac60..bd8abfd60 100644
--- a/dist/locales/de.json
+++ b/dist/locales/de.json
@@ -491,7 +491,7 @@
             },
             "service_roads": {
                 "description": "Erschließungsstraßen",
-                "tooltip": "Erschließungsstraßen, Zufahrtsstraßen, Parkplatzstraßen, Feldwege, Waldwege, etc."
+                "tooltip": "Erschließungsstraßen, Zufahrtsstraßen, Parkplatzstraßen, Waldwege, Feldwege, etc."
             },
             "paths": {
                 "description": "Wege",
@@ -1341,6 +1341,9 @@
                         "clockwise": "im Uhrzeigersinn"
                     }
                 },
+                "clothes": {
+                    "label": "Kleidung"
+                },
                 "club": {
                     "label": "Typ"
                 },
@@ -1358,7 +1361,7 @@
                     "placeholder": "http://example.com/"
                 },
                 "content": {
-                    "label": "Inhalte"
+                    "label": "Inhalt"
                 },
                 "country": {
                     "label": "Land"
@@ -1527,6 +1530,10 @@
                 "generator/method": {
                     "label": "Methode"
                 },
+                "generator/output/electricity": {
+                    "label": "Leistung",
+                    "placeholder": "50 MW, 100 MW, 200 MW..."
+                },
                 "generator/source": {
                     "label": "Quelle"
                 },
@@ -1891,6 +1898,10 @@
                 "plant": {
                     "label": "Pflanze"
                 },
+                "plant/output/electricity": {
+                    "label": "Leistung",
+                    "placeholder": "500 MW, 1000 MW, 2000 MW..."
+                },
                 "population": {
                     "label": "Bevölkerung"
                 },
@@ -2144,7 +2155,7 @@
                     "label": "Typ"
                 },
                 "tracktype": {
-                    "label": "Typ des Feld-/Waldweges",
+                    "label": "Typ des Wald-/Feldweges",
                     "options": {
                         "grade1": "Grad 1 - Fest: befestigt oder sehr kompakte harte Oberfläche",
                         "grade2": "Grad 2 - Größtenteils fest: Kies/Stein gemischt mit etwas weichem Material",
@@ -2570,6 +2581,10 @@
                     "name": "Kirche",
                     "terms": "christlich,Abtei,Basilika,geweihter Ort,Kathedrale,Altarraum,Kantorei,Kapelle,Kirche,Kirchgemeinde,Gotteshaus,Gebetshaus,Dom,Oratorium,Heiligtum,Sacellum,Schrein,Tabernakel,Tempel"
                 },
+                "amenity/place_of_worship/hindu": {
+                    "name": "Hindutempel",
+                    "terms": "<translate with synonyms or related terms for 'Hindu Temple', separated by commas>"
+                },
                 "amenity/place_of_worship/jewish": {
                     "name": "Sy­n­a­go­ge",
                     "terms": "jüdisch,Synagoge"
@@ -2578,6 +2593,18 @@
                     "name": "Moschee",
                     "terms": "muslimisch,Moschee"
                 },
+                "amenity/place_of_worship/shinto": {
+                    "name": "Shintō-Schrein",
+                    "terms": "<translate with synonyms or related terms for 'Shinto Shrine', separated by commas>"
+                },
+                "amenity/place_of_worship/sikh": {
+                    "name": "Sikh-Tempel",
+                    "terms": "<translate with synonyms or related terms for 'Sikh Temple', separated by commas>"
+                },
+                "amenity/place_of_worship/taoist": {
+                    "name": "Tao-Tempel",
+                    "terms": "<translate with synonyms or related terms for 'Taoist Temple', separated by commas>"
+                },
                 "amenity/planetarium": {
                     "name": "Planetarium",
                     "terms": "Planetarium, Projektionsplanetarium, Orrery"
@@ -2743,6 +2770,10 @@
                     "name": "Tierarzt",
                     "terms": "Tierarzt, Tierärztin, Verterinär"
                 },
+                "amenity/waste/dog_excrement": {
+                    "name": "Hundekotabfalleimer",
+                    "terms": "<translate with synonyms or related terms for 'Dog Excrement Bin', separated by commas>"
+                },
                 "amenity/waste_basket": {
                     "name": "Mülleimer",
                     "terms": "Mülleimer,Abfalleimer,Abfallkübel,Abfallbehälter,Mistkübel"
@@ -3441,8 +3472,8 @@
                     "terms": "Verbindungsstraßenanschluss,Kreisstraßenanschluss, Kreisstraßenauffahrt, Kreisstraßenabfahrt, Auffahrt, Abfahrt"
                 },
                 "highway/track": {
-                    "name": "Feld-/Waldweg",
-                    "terms": "Wirtschaftsweg, Feldweg, Waldweg, Forststraße"
+                    "name": "Wald-/Feldweg",
+                    "terms": "Wirtschaftsweg, Waldweg, Feldweg, Forststraße"
                 },
                 "highway/traffic_mirror": {
                     "name": "Verkehrsspiegel",
@@ -3958,6 +3989,14 @@
                     "name": "Wasserwerk",
                     "terms": "Wasserwerk"
                 },
+                "man_made/watermill": {
+                    "name": "Wassermühle",
+                    "terms": "Wassermühle"
+                },
+                "man_made/windmill": {
+                    "name": "Windmühle",
+                    "terms": "Windmühle"
+                },
                 "man_made/works": {
                     "name": "Fabrik",
                     "terms": "Fabrik, Werk, Betrieb, Fabriksanlage, Produktionsstätte, Fertigungsanlage"
@@ -4242,6 +4281,14 @@
                     "name": "Stromgenerator",
                     "terms": "Stromgenerator"
                 },
+                "power/generator/source_nuclear": {
+                    "name": "Kernreaktor",
+                    "terms": "<translate with synonyms or related terms for 'Nuclear Reactor', separated by commas>"
+                },
+                "power/generator/source_wind": {
+                    "name": "Windrad",
+                    "terms": "<translate with synonyms or related terms for 'Wind Turbine', separated by commas>"
+                },
                 "power/line": {
                     "name": "Stromleitung-Hochspannung",
                     "terms": "Stromleitung-Hochspannung, Freileitung, Überlandleitung, Hochspannungsleitung"
diff --git a/dist/locales/dv.json b/dist/locales/dv.json
new file mode 100644
index 000000000..65693acdc
--- /dev/null
+++ b/dist/locales/dv.json
@@ -0,0 +1,91 @@
+{
+    "dv": {
+        "modes": {
+            "add_area": {
+                "description": "ޕާރކުތަކާއި، އިމާރާތްތަކާއި އަދިވެސް ފާހަގަކުރެވޭ ތަންތަން ހިމަނުއްވާ"
+            },
+            "add_line": {
+                "description": "ހައިވޭއާއި، މަގުތަކާއި، ދުވާރާއި އަދި އެހެނިހެން ރޮނގުތައް ހިމަނުއްވާ"
+            },
+            "add_point": {
+                "description": "ރެސްޓޯރަންޓްތަކާއި، ފާހަގަކުރެވޭ ބިނާތަކާއި، ޕޯސްޓް ފޮށިތަކާއި، އެހެނިހެން މުހިއްމު ތަންތަން ހިމަނުއްވާ"
+            }
+        },
+        "inspector": {
+            "add_fields": "ޗާާޓަށް މައުލޫމާތު އެއްކުރައްވާ"
+        },
+        "presets": {
+            "categories": {
+                "category-building": {
+                    "name": "އެކި ވައްތަރުގެ އިމާރާތް"
+                }
+            },
+            "fields": {
+                "address": {
+                    "label": "އެޑްރެސް"
+                },
+                "building": {
+                    "label": "އިމާރާތް"
+                },
+                "building_area": {
+                    "label": "އިމާރާތް"
+                },
+                "structure": {
+                    "options": {
+                        "bridge": "ފާލަން"
+                    }
+                }
+            },
+            "presets": {
+                "address": {
+                    "name": "އެޑްރެސް"
+                },
+                "aeroway/terminal": {
+                    "name": "އެއާރޕޯޓް ގިމަތަ"
+                },
+                "amenity/bank": {
+                    "name": "ބޭންކު"
+                },
+                "amenity/bar": {
+                    "name": "ބާރ"
+                },
+                "amenity/cafe": {
+                    "name": "ކެފޭ"
+                },
+                "amenity/cinema": {
+                    "name": "ސިނަމާ"
+                },
+                "amenity/parking": {
+                    "name": "ކާރު ޕާރކުކުރާ ސަރަޙައްދު"
+                },
+                "amenity/place_of_worship/muslim": {
+                    "name": "މިސްކިތް"
+                },
+                "building": {
+                    "name": "އިމާރާތް"
+                },
+                "building/commercial": {
+                    "name": "ވިިޔަފާރި ޢިމާރާތްތައް"
+                },
+                "highway/bus_stop": {
+                    "name": "ބަސް ހުއްޓި"
+                },
+                "landuse/cemetery": {
+                    "name": "ސަހަރާ"
+                },
+                "landuse/commercial": {
+                    "name": "ވިޔަފާރި ސަރަޙައްދު"
+                },
+                "man_made/bridge": {
+                    "name": "ފާލަން"
+                },
+                "natural/beach": {
+                    "name": "މޫދު ސަރަޙައްދު"
+                },
+                "shop/car_repair": {
+                    "name": "ކާާރު ހަދައިދޭ ގަރާޖް"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/dist/locales/el.json b/dist/locales/el.json
index 0706e2341..4cf891116 100644
--- a/dist/locales/el.json
+++ b/dist/locales/el.json
@@ -869,9 +869,6 @@
                 "contact/webcam": {
                     "placeholder": "http://example.com/"
                 },
-                "content": {
-                    "label": "Περιεχόμενο"
-                },
                 "country": {
                     "label": "Χώρα"
                 },
diff --git a/dist/locales/en-GB.json b/dist/locales/en-GB.json
index db9f2b252..0bce42f6b 100644
--- a/dist/locales/en-GB.json
+++ b/dist/locales/en-GB.json
@@ -547,7 +547,9 @@
         },
         "restore": {
             "heading": "You have unsaved changes",
-            "description": "Do you wish to restore unsaved changes from a previous editing session?"
+            "description": "Do you wish to restore unsaved changes from a previous editing session?",
+            "restore": "Restore my changes",
+            "reset": "Discard my changes"
         },
         "save": {
             "title": "Save",
@@ -1260,7 +1262,7 @@
                     "label": "Type"
                 },
                 "bin": {
-                    "label": "Waste Bin"
+                    "label": "Rubbish Bin"
                 },
                 "blood_components": {
                     "label": "Blood Components",
@@ -1339,6 +1341,9 @@
                         "clockwise": "Clockwise"
                     }
                 },
+                "clothes": {
+                    "label": "Clothes"
+                },
                 "club": {
                     "label": "Type"
                 },
@@ -1356,7 +1361,7 @@
                     "placeholder": "http://example.com/"
                 },
                 "content": {
-                    "label": "Contents"
+                    "label": "Content"
                 },
                 "country": {
                     "label": "Country"
@@ -1525,6 +1530,10 @@
                 "generator/method": {
                     "label": "Method"
                 },
+                "generator/output/electricity": {
+                    "label": "Power Output",
+                    "placeholder": "50 MW, 100 MW, 200 MW..."
+                },
                 "generator/source": {
                     "label": "Source"
                 },
@@ -1605,6 +1614,9 @@
                 "kerb": {
                     "label": "Kerb"
                 },
+                "label": {
+                    "label": "Label"
+                },
                 "lamp_type": {
                     "label": "Type"
                 },
@@ -1676,6 +1688,9 @@
                 "man_made": {
                     "label": "Type"
                 },
+                "manhole": {
+                    "label": "Type"
+                },
                 "map_size": {
                     "label": "Coverage"
                 },
@@ -1883,6 +1898,10 @@
                 "plant": {
                     "label": "Plant"
                 },
+                "plant/output/electricity": {
+                    "label": "Power Output",
+                    "placeholder": "500 MW, 1000 MW, 2000 MW..."
+                },
                 "population": {
                     "label": "Population"
                 },
@@ -2480,12 +2499,24 @@
                 "amenity/place_of_worship/christian": {
                     "name": "Church"
                 },
+                "amenity/place_of_worship/hindu": {
+                    "name": "Hindu Temple"
+                },
                 "amenity/place_of_worship/jewish": {
                     "name": "Synagogue"
                 },
                 "amenity/place_of_worship/muslim": {
                     "name": "Mosque"
                 },
+                "amenity/place_of_worship/shinto": {
+                    "name": "Shinto Shrine"
+                },
+                "amenity/place_of_worship/sikh": {
+                    "name": "Sikh Temple"
+                },
+                "amenity/place_of_worship/taoist": {
+                    "name": "Taoist Temple"
+                },
                 "amenity/planetarium": {
                     "name": "Planetarium"
                 },
@@ -2532,6 +2563,9 @@
                 "amenity/school": {
                     "name": "School Grounds"
                 },
+                "amenity/scrapyard": {
+                    "name": "Scrap Yard"
+                },
                 "amenity/shelter": {
                     "name": "Shelter"
                 },
@@ -2610,8 +2644,11 @@
                 "amenity/veterinary": {
                     "name": "Veterinary"
                 },
+                "amenity/waste/dog_excrement": {
+                    "name": "Dog Excrement Bin"
+                },
                 "amenity/waste_basket": {
-                    "name": "Waste Basket"
+                    "name": "Rubbish Bin"
                 },
                 "amenity/waste_disposal": {
                     "name": "Garbage Dumpster"
@@ -3535,9 +3572,21 @@
                 "man_made/water_works": {
                     "name": "Water Works"
                 },
+                "man_made/watermill": {
+                    "name": "Watermill"
+                },
+                "man_made/windmill": {
+                    "name": "Windmill"
+                },
                 "man_made/works": {
                     "name": "Factory"
                 },
+                "manhole": {
+                    "name": "Manhole"
+                },
+                "manhole/drain": {
+                    "name": "Storm Drain"
+                },
                 "natural": {
                     "name": "Natural"
                 },
@@ -3745,6 +3794,12 @@
                 "power/generator": {
                     "name": "Power Generator"
                 },
+                "power/generator/source_nuclear": {
+                    "name": "Nuclear Reactor"
+                },
+                "power/generator/source_wind": {
+                    "name": "Wind Turbine"
+                },
                 "power/line": {
                     "name": "Power Line"
                 },
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 2eb22882d..2428c59bc 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1284,6 +1284,10 @@
                 "brand": {
                     "label": "Brand"
                 },
+                "bridge": {
+                    "label": "Type",
+                    "placeholder": "Default"
+                },
                 "building_area": {
                     "label": "Building"
                 },
@@ -1386,6 +1390,10 @@
                 "currency_multi": {
                     "label": "Currency Types"
                 },
+                "cutting": {
+                    "label": "Type",
+                    "placeholder": "Default"
+                },
                 "cycle_network": {
                     "label": "Network"
                 },
@@ -1471,6 +1479,10 @@
                     "label": "Email",
                     "placeholder": "example@example.com"
                 },
+                "embankment": {
+                    "label": "Type",
+                    "placeholder": "Default"
+                },
                 "emergency": {
                     "label": "Emergency"
                 },
@@ -1511,6 +1523,10 @@
                 "fixme": {
                     "label": "Fix Me"
                 },
+                "ford": {
+                    "label": "Type",
+                    "placeholder": "Default"
+                },
                 "fuel_multi": {
                     "label": "Fuel Types"
                 },
@@ -1542,10 +1558,6 @@
                 "generator/type": {
                     "label": "Type"
                 },
-                "golf_hole": {
-                    "label": "Reference",
-                    "placeholder": "Hole number (1-18)"
-                },
                 "grape_variety": {
                     "label": "Grape Varieties"
                 },
@@ -1630,7 +1642,8 @@
                     "placeholder": "1, 2, 3..."
                 },
                 "layer": {
-                    "label": "Layer"
+                    "label": "Layer",
+                    "placeholder": "0"
                 },
                 "leaf_cycle_singular": {
                     "label": "Leaf Cycle",
@@ -1713,6 +1726,10 @@
                 "maxweight": {
                     "label": "Max Weight"
                 },
+                "milestone_position": {
+                    "label": "Milestone Position",
+                    "placeholder": "Distance to one decimal (123.4)"
+                },
                 "mtb/scale": {
                     "label": "Mountain Biking Difficulty",
                     "placeholder": "0, 1, 2, 3...",
@@ -1932,8 +1949,38 @@
                         "centre": "Recycling Center"
                     }
                 },
+                "ref_aeroway_gate": {
+                    "label": "Gate Number"
+                },
+                "ref_golf_hole": {
+                    "label": "Hole Number",
+                    "placeholder": "1-18"
+                },
+                "ref_highway_junction": {
+                    "label": "Junction Number"
+                },
+                "ref_platform": {
+                    "label": "Platform Number"
+                },
+                "ref_road_number": {
+                    "label": "Road Number"
+                },
+                "ref_route": {
+                    "label": "Route Number"
+                },
+                "ref_runway": {
+                    "label": "Runway Number",
+                    "placeholder": "e.g. 01L/19R"
+                },
+                "ref_stop_position": {
+                    "label": "Stop Number"
+                },
+                "ref_taxiway": {
+                    "label": "Taxiway Name",
+                    "placeholder": "e.g. A5"
+                },
                 "ref": {
-                    "label": "Reference"
+                    "label": "Reference Code"
                 },
                 "relation": {
                     "label": "Type"
@@ -2188,9 +2235,13 @@
                 "trees": {
                     "label": "Trees"
                 },
-                "tunnel": {
+                "tunnel_waterway": {
                     "label": "Tunnel"
                 },
+                "tunnel": {
+                    "label": "Type",
+                    "placeholder": "Default"
+                },
                 "vending": {
                     "label": "Type of Goods"
                 },
@@ -2322,7 +2373,7 @@
                 },
                 "aerialway/t-bar": {
                     "name": "T-bar Lift",
-                    "terms": ""
+                    "terms": "tbar"
                 },
                 "aeroway/aerodrome": {
                     "name": "Airport",
@@ -2718,7 +2769,7 @@
                 },
                 "amenity/social_facility/group_home": {
                     "name": "Elderly Group Home",
-                    "terms": "old,senior,living"
+                    "terms": "old,senior,living,care home,assisted living"
                 },
                 "amenity/social_facility/homeless_shelter": {
                     "name": "Homeless Shelter",
@@ -2726,7 +2777,7 @@
                 },
                 "amenity/social_facility/nursing_home": {
                     "name": "Nursing Home",
-                    "terms": "elderly,living,nursing,old,senior"
+                    "terms": "elderly,living,nursing,old,senior,assisted living"
                 },
                 "amenity/studio": {
                     "name": "Studio",
@@ -3986,7 +4037,7 @@
                 },
                 "man_made/pier": {
                     "name": "Pier",
-                    "terms": "dock"
+                    "terms": "dock,jetty"
                 },
                 "man_made/pipeline": {
                     "name": "Pipeline",
@@ -4056,6 +4107,10 @@
                     "name": "Storm Drain",
                     "terms": "cover,drain,hole,rain,sewer,sewage,storm"
                 },
+                "manhole/telecom": {
+                    "name": "Telecom Manhole",
+                    "terms": "cover,phone,hole,telecom,telephone,bt"
+                },
                 "natural": {
                     "name": "Natural",
                     "terms": ""
@@ -4376,10 +4431,18 @@
                     "name": "Abandoned Railway",
                     "terms": ""
                 },
+                "railway/buffer_stop": {
+                    "name": "Buffer Stop",
+                    "terms": "stop,halt,buffer"
+                },
                 "railway/crossing": {
                     "name": "Railway Crossing (Path)",
                     "terms": "crossing,pedestrian crossing,railroad crossing,level crossing,grade crossing,path through railroad,train crossing"
                 },
+                "railway/derail": {
+                    "name": "Railway Derailer",
+                    "terms": "derailer"
+                },
                 "railway/disused": {
                     "name": "Disused Railway",
                     "terms": ""
@@ -4396,6 +4459,10 @@
                     "name": "Railway Crossing (Road)",
                     "terms": "crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing"
                 },
+                "railway/milestone": {
+                    "name": "Railway Milestone",
+                    "terms": "milestone,marker"
+                },
                 "railway/monorail": {
                     "name": "Monorail",
                     "terms": ""
@@ -4412,6 +4479,10 @@
                     "name": "Rail",
                     "terms": ""
                 },
+                "railway/signal": {
+                    "name": "Railway Signal",
+                    "terms": "signal,lights"
+                },
                 "railway/station": {
                     "name": "Railway Station",
                     "terms": "train station,station"
@@ -4424,6 +4495,14 @@
                     "name": "Subway",
                     "terms": "metro,transit"
                 },
+                "railway/switch": {
+                    "name": "Railway Switch",
+                    "terms": "switch,points"
+                },
+                "railway/train_wash": {
+                    "name": "Train Wash",
+                    "terms": "wash,clean"
+                },
                 "railway/tram_stop": {
                     "name": "Tram Stop",
                     "terms": "light rail,streetcar,tram,trolley"
diff --git a/dist/locales/eo.json b/dist/locales/eo.json
index 204c06d9a..078dd505b 100644
--- a/dist/locales/eo.json
+++ b/dist/locales/eo.json
@@ -353,6 +353,7 @@
                 "key": "B",
                 "title": "Fono",
                 "zoom": "Pligrandigo",
+                "vintage": "Fotita je",
                 "unknown": "Nekonata",
                 "show_tiles": "Montri kahelojn",
                 "hide_tiles": "Kaŝi kahelojn"
@@ -1338,6 +1339,9 @@
                         "clockwise": "Horloĝdirekte"
                     }
                 },
+                "clothes": {
+                    "label": "Vestaĵoj"
+                },
                 "club": {
                     "label": "Speco"
                 },
@@ -1524,6 +1528,10 @@
                 "generator/method": {
                     "label": "Metodo"
                 },
+                "generator/output/electricity": {
+                    "label": "Povumo",
+                    "placeholder": "50 MW, 100 MW, 200 MW…"
+                },
                 "generator/source": {
                     "label": "Energi-fonto"
                 },
@@ -1888,6 +1896,10 @@
                 "plant": {
                     "label": "Vegetaĵo"
                 },
+                "plant/output/electricity": {
+                    "label": "Povumo",
+                    "placeholder": "500 MW, 1000 MW, 2000 MW…"
+                },
                 "population": {
                     "label": "Loĝantaro"
                 },
@@ -2567,6 +2579,10 @@
                     "name": "Kirko",
                     "terms": "kristana preĝejo,mesejo,kapelo,katedralo,baziliko,abatejo,monaĥejo,kristanismo,katolika preĝejo"
                 },
+                "amenity/place_of_worship/hindu": {
+                    "name": "Hinduisma templo",
+                    "terms": "templo"
+                },
                 "amenity/place_of_worship/jewish": {
                     "name": "Sinagogo",
                     "terms": "juda preĝejo,judismo,judaismo"
@@ -2575,6 +2591,18 @@
                     "name": "Moskeo",
                     "terms": "islama preĝejo,islamo,minareto"
                 },
+                "amenity/place_of_worship/shinto": {
+                    "name": "Ŝintoismo adorejo",
+                    "terms": "shintoismo,sxintoismo,templo,adorejo,ŝintoo,kamio"
+                },
+                "amenity/place_of_worship/sikh": {
+                    "name": "Sikisma templo",
+                    "terms": "siĥismo,templo"
+                },
+                "amenity/place_of_worship/taoist": {
+                    "name": "Taoisma templo",
+                    "terms": "templo,daŭismo,taismo"
+                },
                 "amenity/planetarium": {
                     "name": "Planetario (astrokinejo)",
                     "terms": "astrokinejo,astroobservejo,astrobservejo,astronomio,stelscienco,astroscienco"
@@ -2740,6 +2768,10 @@
                     "name": "Bestokuracistejo",
                     "terms": "bestokuracisto,bestkuracisto,veterinaro"
                 },
+                "amenity/waste/dog_excrement": {
+                    "name": "Rubujo por hund-fekaĵoj",
+                    "terms": "rubujo,hundaj fekoj,fekaĵoj,eksrementoj"
+                },
                 "amenity/waste_basket": {
                     "name": "Rubujo",
                     "terms": "balaaĵujo,balaaĵkesto,rubkesto,forĵetaĵujo"
@@ -3955,6 +3987,14 @@
                     "name": "Akvotrinkebligejo",
                     "terms": "akvopurigejo,trinkebligejo,seninfektigo de akvo,akvokonduktilo"
                 },
+                "man_made/watermill": {
+                    "name": "Muelejo akva",
+                    "terms": "muelejo,akvomuelejo,grenmuelejo,akvmueejo"
+                },
+                "man_made/windmill": {
+                    "name": "Muelejo venta",
+                    "terms": "ventmuelejo,ventomuelejo,ventoturbino,grenmuelejo"
+                },
                 "man_made/works": {
                     "name": "Fabriko",
                     "terms": "produktejo,uzino,manufakturo"
@@ -4239,6 +4279,14 @@
                     "name": "Elektr-generilo",
                     "terms": "elektrogenerilo,generilo,generatoro"
                 },
+                "power/generator/source_nuclear": {
+                    "name": "Nuklea reakciujo",
+                    "terms": "nuklea reaktoro,reaktoro,reakciujo,atoma reaktoro,atompilo,elektrocentralo"
+                },
+                "power/generator/source_wind": {
+                    "name": "Ventoturbino",
+                    "terms": "ventturbino,elektrogenerilo,ventomuelejo,ventturbino,ventelektrigilo,ventmotoro,ventenergio"
+                },
                 "power/line": {
                     "name": "Elektra kondukilo (alttensia)",
                     "terms": "lineo forkurenta,kablo"
diff --git a/dist/locales/es.json b/dist/locales/es.json
index 928359e2e..354e6f4ca 100644
--- a/dist/locales/es.json
+++ b/dist/locales/es.json
@@ -2,7 +2,7 @@
     "es": {
         "modes": {
             "add_area": {
-                "title": "Árezo",
+                "title": "Área",
                 "description": "Añade parques, edificios, lagos, bosques u otras áreas al mapa.",
                 "tail": "Haga clic en el mapa para empezar a dibujar un área, como un parque, lago o edificio."
             },
@@ -1134,35 +1134,35 @@
                     "label": "Dirección",
                     "placeholders": {
                         "block_number": "Número de manzana",
-                        "block_number!jp": "Nro. de manzana",
+                        "block_number!jp": "Nro. de manzana - Japón",
                         "city": "Ciudad",
-                        "city!jp": "Ciudad / Pueblo / Aldea / Barrio especial de Tokio",
+                        "city!jp": "Ciudad / Pueblo / Aldea / Barrio especial de Tokio - Japón",
                         "city!vn": "Ciudad / Pueblo",
                         "conscriptionnumber": "123",
                         "country": "País",
                         "county": "Condado",
-                        "county!jp": "Distrito",
+                        "county!jp": "Distrito - Japón",
                         "district": "Distrito",
                         "district!vn": "Arrondissement / Pueblo / Distrito",
                         "floor": "Piso",
                         "hamlet": "Aldea / Caserío",
                         "housename": "Nombre de la casa",
                         "housenumber": "123",
-                        "housenumber!jp": "Nro. de edificio/Nro. de lote",
+                        "housenumber!jp": "Nro. de edificio / Nro. de lote - Japón",
                         "neighbourhood": "Barrio",
-                        "neighbourhood!jp": "Chōme / Aza / Koaza",
+                        "neighbourhood!jp": "Chōme / Aza / Koaza - Japón",
                         "place": "Lugar",
                         "postcode": "Código postal",
                         "province": "Provincia",
-                        "province!jp": "Prefectura",
-                        "quarter": "Quarter",
-                        "quarter!jp": "Ōaza / Machi",
+                        "province!jp": "Prefectura - Japón",
+                        "quarter": "Barrio",
+                        "quarter!jp": "Ōaza / Machi - Japón",
                         "state": "Estado",
                         "street": "Calle",
                         "subdistrict": "Subdistrito",
                         "subdistrict!vn": "Barrio / Comuna / Pueblito",
                         "suburb": "Suburbio",
-                        "suburb!jp": "Ward"
+                        "suburb!jp": "Ward - Japón"
                     }
                 },
                 "admin_level": {
@@ -1341,6 +1341,9 @@
                         "clockwise": "En sentido horario"
                     }
                 },
+                "clothes": {
+                    "label": "Ropa"
+                },
                 "club": {
                     "label": "Tipo"
                 },
@@ -1527,6 +1530,10 @@
                 "generator/method": {
                     "label": "Método"
                 },
+                "generator/output/electricity": {
+                    "label": "Potencia de salida",
+                    "placeholder": "50 MW, 100 MW, 200 MW..."
+                },
                 "generator/source": {
                     "label": "Fuente"
                 },
@@ -1607,6 +1614,9 @@
                 "kerb": {
                     "label": "Bordillo/Cordón"
                 },
+                "label": {
+                    "label": "Etiqueta"
+                },
                 "lamp_type": {
                     "label": "Tipo"
                 },
@@ -1678,6 +1688,9 @@
                 "man_made": {
                     "label": "Tipo"
                 },
+                "manhole": {
+                    "label": "Tipo"
+                },
                 "map_size": {
                     "label": "Cobertura"
                 },
@@ -1885,6 +1898,10 @@
                 "plant": {
                     "label": "Planta"
                 },
+                "plant/output/electricity": {
+                    "label": "Potencia de salida",
+                    "placeholder": "500 MW, 1000 MW, 2000 MW..."
+                },
                 "population": {
                     "label": "Población"
                 },
@@ -2564,6 +2581,10 @@
                     "name": "Iglesia cristiana",
                     "terms": "templo, capilla, parroquia, santuario, ermita, oratorio, iglesia, oratorio, la iglesia"
                 },
+                "amenity/place_of_worship/hindu": {
+                    "name": "Templo hindú",
+                    "terms": "Templo, hindú, Grbrgrih, Mandu, adoración, capilla, templo, santuario"
+                },
                 "amenity/place_of_worship/jewish": {
                     "name": "Sinagoga",
                     "terms": "templo, aljama, sinagoga, judío, religión"
@@ -2572,6 +2593,18 @@
                     "name": "Mezquita",
                     "terms": "mezquita, morabito, rábida, musulmán, religión"
                 },
+                "amenity/place_of_worship/shinto": {
+                    "name": "Santuario sintoísta",
+                    "terms": "Santuario, Shinto, sintoísta, Kami, Torii, capilla, templo"
+                },
+                "amenity/place_of_worship/sikh": {
+                    "name": "Templo Sij",
+                    "terms": "Templo, Sij, Sikh, Gurudwara"
+                },
+                "amenity/place_of_worship/taoist": {
+                    "name": "Templo Taoísta",
+                    "terms": "Templo, Taoísta, monasterio"
+                },
                 "amenity/planetarium": {
                     "name": "Planetario",
                     "terms": "planetario, observatorio, proyección, cuerpos celestes, estrellas, planetas, astronomía, universo"
@@ -2631,6 +2664,10 @@
                     "name": "Terreno escolar",
                     "terms": "terreno, área, suelo, recinto escolar, escolar, escuela, colegio, centro educativo, unidad educativa, primaria, secundaria, secundario, instituto"
                 },
+                "amenity/scrapyard": {
+                    "name": "Depósito de chatarra",
+                    "terms": "Depósito de chatarra, cementerio de coches, auto, coche, vehículo, basura, metal, objetos salvados, chatarra, naufragio, desguace"
+                },
                 "amenity/shelter": {
                     "name": "Refugio",
                     "terms": "albergue, abrigo, amparo, asilo, cobertizo, garita, refugio"
@@ -2733,6 +2770,10 @@
                     "name": "Veterinario",
                     "terms": "veterinario, veterinaria, albéitar, mascotas, animales, perros, gatos"
                 },
+                "amenity/waste/dog_excrement": {
+                    "name": "Recipiente para excremento de perro",
+                    "terms": "Basura, tacho, recipiente, caca, excremento, perro"
+                },
                 "amenity/waste_basket": {
                     "name": "Papelera",
                     "terms": "papelera, papelero, cubo, contenedor, basura, papeles, deshecho, tacho"
@@ -3948,10 +3989,26 @@
                     "name": "Planta potabilizadora de agua",
                     "terms": "potabilizadora, ETAP, planta potabilizadora, abastecimiento de agua, agua potable"
                 },
+                "man_made/watermill": {
+                    "name": "Molino de agua",
+                    "terms": "agua, rueda, molino"
+                },
+                "man_made/windmill": {
+                    "name": "Molino de viento",
+                    "terms": "Viento, rueda, molino"
+                },
                 "man_made/works": {
                     "name": "Fábrica",
                     "terms": "factoría, manofactura, industria, taller, ensamblaje, planta, materia prima, fabricado, producción, fabricación, ingenio, procesadora, refinería, cervecería, azucarera"
                 },
+                "manhole": {
+                    "name": "Pozo de inspección",
+                    "terms": "Cubierta, tapa, agujero, alcantarillado, telecomunicaciones, pozo, sumidero, boca de alcantarilla, boca de inspección, pozo de registro, abertura, boca de acceso"
+                },
+                "manhole/drain": {
+                    "name": "Desagüe pluvial",
+                    "terms": "Cubierta, tapa, desagüe, agujero, pozo, lluvia, alcantarillado, tormenta, boca de tormenta, alcantarillado pluvial"
+                },
                 "natural": {
                     "name": "Natural",
                     "terms": "natural, naturaleza, geológica, cubierta terrestre, vegetación"
@@ -4194,16 +4251,16 @@
                     "terms": "barrio, vecindario, vecindad, urbanización, colonia"
                 },
                 "place/quarter": {
-                    "name": "Sub-Borough / Quarter",
-                    "terms": "sub-distrito, cuadrante, delegación, localidad, barrio, vecindario"
+                    "name": "Sub-municipio / Barrio",
+                    "terms": "sub-municipio, sub-distrito, sector, cuadrante, delegación, localidad, barrio, vecindario"
                 },
                 "place/square": {
                     "name": "Plaza",
                     "terms": "plaza"
                 },
                 "place/suburb": {
-                    "name": "Borough / Suburbio",
-                    "terms": "distrito, suburbio"
+                    "name": "Municipio / Suburbio",
+                    "terms": "municipio, división administrativa, division administrativa, burgo, delegación, delegacion, localidad"
                 },
                 "place/town": {
                     "name": "Ciudad pequeña",
@@ -4224,6 +4281,14 @@
                     "name": "Generador de energía",
                     "terms": "subestación, generador, generador eléctrico, generador de electricidad, generador de potencia"
                 },
+                "power/generator/source_nuclear": {
+                    "name": "Reactor nuclear",
+                    "terms": "Fisión, generador, nuclear, reactor"
+                },
+                "power/generator/source_wind": {
+                    "name": "Turbina eólica",
+                    "terms": "Generador, turbina, molino de viento, viento, eólico, eolico"
+                },
                 "power/line": {
                     "name": "Línea de alta tensión",
                     "terms": "energía, línea, eléctrica, líneas eléctricas, linea electrica, lineas electricas"
diff --git a/dist/locales/et.json b/dist/locales/et.json
index 1b86dbfb7..9c6dc0115 100644
--- a/dist/locales/et.json
+++ b/dist/locales/et.json
@@ -761,9 +761,6 @@
                     "label": "Veebikaamera URL",
                     "placeholder": "http://näidis.ee"
                 },
-                "content": {
-                    "label": "Sisu"
-                },
                 "country": {
                     "label": "Riik"
                 },
diff --git a/dist/locales/fa.json b/dist/locales/fa.json
index a4165710d..c9872d6a6 100644
--- a/dist/locales/fa.json
+++ b/dist/locales/fa.json
@@ -907,9 +907,6 @@
                     "label": "URL دوربین",
                     "placeholder": "http://example.com/"
                 },
-                "content": {
-                    "label": "محتویات"
-                },
                 "country": {
                     "label": "کشور"
                 },
diff --git a/dist/locales/fi.json b/dist/locales/fi.json
index 8d5a654eb..4d6d774cd 100644
--- a/dist/locales/fi.json
+++ b/dist/locales/fi.json
@@ -993,9 +993,6 @@
                     "label": "Kameran verkko-osoite",
                     "placeholder": "http://www.esimerkki.fi/"
                 },
-                "content": {
-                    "label": "Sisältö"
-                },
                 "country": {
                     "label": "Maa"
                 },
diff --git a/dist/locales/fr.json b/dist/locales/fr.json
index 6b869553b..d4f1cec0c 100644
--- a/dist/locales/fr.json
+++ b/dist/locales/fr.json
@@ -2,7 +2,7 @@
     "fr": {
         "modes": {
             "add_area": {
-                "title": "Polygon",
+                "title": "Polygone",
                 "description": "Ajouter des parcs, des bâtiments, des lacs ou d'autres polygones à la carte.",
                 "tail": "Cliquez sur la carte pour ajouter un polygone tel qu'un parc, un lac ou un bâtiment."
             },
@@ -30,15 +30,15 @@
         "operations": {
             "add": {
                 "annotation": {
-                    "point": "Un point créé.",
-                    "vertex": "Un nœud ajouté à une ligne.",
-                    "relation": "Relation ajoutée."
+                    "point": "ajout d'un point.",
+                    "vertex": "ajout d'un nœud à une ligne.",
+                    "relation": "création d'une relation."
                 }
             },
             "start": {
                 "annotation": {
-                    "line": "Une ligne commencée.",
-                    "area": "Un polygone commencé."
+                    "line": "création d'une ligne.",
+                    "area": "création d'un polygone."
                 }
             },
             "continue": {
@@ -48,8 +48,8 @@
                 "not_eligible": "Aucune ligne ne peut être poursuivie ici.",
                 "multiple": "Plusieurs lignes peuvent être poursuivies ici. Pour choisir une ligne, appuyez sur la touche Shift / Majuscule du clavier et appuyez sur la ligne voulue pour la sélectionner.",
                 "annotation": {
-                    "line": "Une ligne continuée.",
-                    "area": "Un polygone continué."
+                    "line": "poursuite d'une ligne.",
+                    "area": "poursuite d'un polygone."
                 }
             },
             "cancel_draw": {
@@ -69,8 +69,8 @@
                 },
                 "key": "O",
                 "annotation": {
-                    "line": "Ligne rendue circulaire.",
-                    "area": "Polygone rendu circulaire."
+                    "line": "ligne rendue circulaire.",
+                    "area": "polygone rendu circulaire."
                 },
                 "not_closed": "Cet élément ne peut pas être rendu circulaire car il ne boucle pas.",
                 "too_large": "Ceci ne peut pas être transformé en cercle parce qu'une partie n'est pas visible.",
@@ -84,8 +84,8 @@
                 },
                 "key": "S",
                 "annotation": {
-                    "line": "Ligne rendue orthogonale.",
-                    "area": "Polygone rendu orthogonal."
+                    "line": "ligne rendue orthogonale.",
+                    "area": "polygone rendu orthogonal."
                 },
                 "not_squarish": "Cela ne peut être fait, ce n'est pas carré.",
                 "too_large": "Ceci ne peut pas être transformé en rectangle parce qu'une partie n'est pas visible.",
@@ -95,7 +95,7 @@
                 "title": "Rendre droit",
                 "description": "Rendre cette ligne droite.",
                 "key": "S",
-                "annotation": "Rendre une ligne droite.",
+                "annotation": "rendu une ligne droite.",
                 "too_bendy": "Cela ne peut pas être redressé, car la courbe est trop importante.",
                 "connected_to_hidden": "Cette ligne ne peut être rendue droite parce qu'elle est connecté à un élément caché."
             },
@@ -106,12 +106,12 @@
                     "multiple": "Supprimer ces éléments définitivement."
                 },
                 "annotation": {
-                    "point": "Point supprimé",
-                    "vertex": "Nœud d'une ligne supprimé.",
-                    "line": "Ligne supprimée.",
-                    "area": "Polygone supprimé.",
-                    "relation": "Relation supprimée.",
-                    "multiple": "{n} éléments supprimés."
+                    "point": "suppression d'un point.",
+                    "vertex": "suppression d'un nœud d'une ligne.",
+                    "line": "suppression d'une ligne.",
+                    "area": "suppression d'un polygone.",
+                    "relation": "suppression d'une relation.",
+                    "multiple": "suppression de {n} éléments."
                 },
                 "too_large": {
                     "single": "Cet élément ne peut pas être supprimé car il n'est pas suffisamment visible.",
@@ -131,24 +131,24 @@
                 }
             },
             "add_member": {
-                "annotation": "Membre ajouté à une relation."
+                "annotation": "ajout d'un membre à une relation."
             },
             "delete_member": {
-                "annotation": "Membre supprimé d'une relation."
+                "annotation": "suppression d'un membre d'une relation."
             },
             "connect": {
                 "annotation": {
-                    "point": "Joindre une ligne à un point.",
-                    "vertex": "Joindre les nœuds à une ligne.",
-                    "line": "Joindre les chemins ensemble.",
-                    "area": "Joindre une ligne à un polygone."
+                    "point": "connexion d'un chemin à un point.",
+                    "vertex": "connexion d'un chemin à un autre chemin.",
+                    "line": "connexion d'un chemin à une ligne.",
+                    "area": "connexion d'un chemin à un polygone."
                 }
             },
             "disconnect": {
                 "title": "Séparer",
                 "description": "Séparer les lignes/contours l'un de l'autre.",
                 "key": "D",
-                "annotation": "Lignes non connectées.",
+                "annotation": "déconnexion de lignes ou polygones.",
                 "not_connected": "Il n'y a pas ici de lignes/polygones à déconnecter.",
                 "connected_to_hidden": "Ceci ne peut être déconnecté parce que c'est connecté à un élément caché.",
                 "relation": "Ceci ne peut être déconnecté parce que cela connecte les membres d'une relation."
@@ -157,7 +157,7 @@
                 "title": "Fusionner",
                 "description": "Fusionner ces éléments",
                 "key": "C",
-                "annotation": "{n} éléments fusionnés",
+                "annotation": "fusion de {n} éléments.",
                 "not_eligible": "Ces éléments ne peuvent pas être fusionnés.",
                 "not_adjacent": "Ces éléments ne peuvent être fusionnés car leurs extrémités ne sont pas connectés.",
                 "restriction": "Ces éléments ne peuvent être fusionnés car au moins l'un d'entre eux est membre de la relation \"{relation}\".",
@@ -172,11 +172,11 @@
                 },
                 "key": "M",
                 "annotation": {
-                    "point": "Point déplacé.",
-                    "vertex": "Nœud d'une ligne déplacé.",
-                    "line": "Ligne déplacée.",
-                    "area": "Polygone déplacé.",
-                    "multiple": "Plusieurs éléments déplacés."
+                    "point": "déplacement d'un point .",
+                    "vertex": "déplacement d'un nœud d'une ligne.",
+                    "line": "déplacement d'une ligne.",
+                    "area": "déplacement d'un polygone.",
+                    "multiple": "déplacement de plusieurs éléments."
                 },
                 "incomplete_relation": {
                     "single": "Cet élément ne peut pas être déplacé car il n'est pas téléchargé totalement.",
@@ -212,12 +212,12 @@
                 },
                 "annotation": {
                     "long": {
-                        "single": "Miroir par rapport au grand axe de l'élément.",
-                        "multiple": "Miroir par rapport au grand axe des éléments effectué."
+                        "single": "réflexion d'un élément par rapport à son grand axe.",
+                        "multiple": "réflexion d'éléments par rapport à leur grand axe."
                     },
                     "short": {
-                        "single": "Miroir par rapport au petit axe de l'élément.",
-                        "multiple": "Miroir par rapport au petit axe des éléments effectué."
+                        "single": "réflexion d'un élément par rapport à son petit axe.",
+                        "multiple": "réflexion d'éléments par rapport à leur petit axe."
                     }
                 },
                 "incomplete_relation": {
@@ -241,9 +241,9 @@
                 },
                 "key": "R",
                 "annotation": {
-                    "line": "Pivoter la ligne.",
-                    "area": "Pivoter un polygone.",
-                    "multiple": "Tourner plusieurs éléments."
+                    "line": "ligne pivotée.",
+                    "area": "polygone pivoté.",
+                    "multiple": "plusieurs éléments pivotés."
                 },
                 "incomplete_relation": {
                     "single": "Cet élément ne peut pas être tourné car il n'est pas téléchargé totalement.",
@@ -262,7 +262,7 @@
                 "title": "Inverser",
                 "description": "Inverse le sens d'une ligne.",
                 "key": "V",
-                "annotation": "Sens d'une ligne inversé."
+                "annotation": "sens d'une ligne inversé."
             },
             "split": {
                 "title": "Couper",
@@ -273,9 +273,9 @@
                 },
                 "key": "X",
                 "annotation": {
-                    "line": "Coupe une ligne.",
-                    "area": "Couper le contour d'un polygone.",
-                    "multiple": "Couper {n} lignes/contour de polygone."
+                    "line": "ligne coupée.",
+                    "area": "contour d'un polygone coupé.",
+                    "multiple": "{n} lignes/contours de polygone coupés."
                 },
                 "not_eligible": "Les lignes ne peuvent pas être coupées à leurs extrémités.",
                 "multiple_ways": "Il y a trop de ligne à cet endroit pour pouvoir couper.",
@@ -289,8 +289,8 @@
                     "toggle_off": "Cliquez pour supprimer la restriction \"{restriction}\"."
                 },
                 "annotation": {
-                    "create": "Interdiction de tourner ajoutée",
-                    "delete": "Interdiction de tourner supprimée"
+                    "create": "interdiction de tourner ajoutée.",
+                    "delete": "interdiction de tourner supprimée."
                 }
             }
         },
@@ -334,7 +334,7 @@
             "upload_explanation_with_user": "Les modifications envoyées en tant que {user} seront visibles sur toutes les cartes qui utilisent les données d'OpenStreetMap.",
             "save": "Envoyer",
             "cancel": "Annuler",
-            "changes": "{count} changements",
+            "changes": "{count} modifications",
             "warnings": "Attention",
             "modified": "Modifié",
             "deleted": "Supprimé",
@@ -345,8 +345,8 @@
             "google_warning_link": "http://www.openstreetmap.org/copyright"
         },
         "contributors": {
-            "list": "Editions de {users}",
-            "truncated_list": "Editions de {users} et de {count} autres"
+            "list": "Modifications de {users}",
+            "truncated_list": "Modifications de {users} et de {count} autres"
         },
         "geometry": {
             "point": "point",
@@ -1289,9 +1289,6 @@
                     "label": "adresse de visioconférence",
                     "placeholder": "http://example.com/"
                 },
-                "content": {
-                    "label": "Contenu"
-                },
                 "country": {
                     "label": "Pays"
                 },
diff --git a/dist/locales/gl.json b/dist/locales/gl.json
index cb05aaf95..5991392db 100644
--- a/dist/locales/gl.json
+++ b/dist/locales/gl.json
@@ -571,12 +571,12 @@
                 "delete": "Deixar eliminadas",
                 "download_changes": "ou descargar os seus cambios.",
                 "done": "Resolvéronse todos os conflitos.",
-                "help": "Outro usuario mudou algunhas das mesmas características do teu mapa e as cambiou.\nPrema en cada recurso de abaixo para máis detalles sobre o conflito, e escolla se quere mantelas\nteus cambios ou os cambios de outro usuario .\n"
+                "help": "Outro usuario cambiou algunhas das mesmas características que ti cambiaches.\nPreme en cada recurso de abaixo para ver máis detalles sobre o conflito, e escolle se queres manter\nos teus cambios ou os cambios do outro usuario.\n"
             }
         },
         "merge_remote_changes": {
             "conflict": {
-                "deleted": "Estos elementos deben ser borrados polo {user}.",
+                "deleted": "Este elemento foron borrados por {user}.",
                 "location": "Este elemento foi movido por ambos ti e {user}.",
                 "nodelist": "Este obxecto cambiáchedelo ti e {user}.",
                 "memberlist": "Os elementos da relación modificáronnos {user} e máis vostede,",
@@ -621,7 +621,7 @@
             "disconnected_highway": "Autoestrada desconectada",
             "disconnected_highway_tooltip": "As estradas deben ser conectadas a outras estradas ou entradas dos edificios.",
             "old_multipolygon": "Etiquetas multipolígono na vía exterior",
-            "old_multipolygon_tooltip": "Este estilo de multipolígono está obsoleto. Por favor, asignarlle as etiquetas para o multipolígono pai en vez da vía exterior.",
+            "old_multipolygon_tooltip": "Este estilo de multipolígono está obsoleto. Por favor, asígnalle as etiquetas ao multipolígono pai en vez da vía exterior.",
             "untagged_point": "Punto sen etiquetar",
             "untagged_point_tooltip": "Escolle un tipo de elemento que describa o que é este punto.",
             "untagged_line": "Liña sen etiquetar",
@@ -642,7 +642,7 @@
         "full_screen": "Pasar a pantalla completa",
         "gpx": {
             "local_layer": "Arquivo local",
-            "drag_drop": "Corta e pegar un arquivo .gpx, .geojson ou .kml nesta páxina, ou preme o botón dereito do rato",
+            "drag_drop": "Arrastra e solta un ficheiro .gpx, .geojson ou .kml sobre a páxina, ou fai clic no botón da dereita para buscalo",
             "zoom": "Zoom na capa",
             "browse": "Buscar un arquivo"
         },
@@ -651,8 +651,8 @@
             "title": "Superposición de fotos (Mapillary)"
         },
         "mapillary_signs": {
-            "tooltip": "Sinais de tráfico de Mapillary (debe activar Photo Overlay)",
-            "title": "Sinais de tráfico Overlay (Mapillary)"
+            "tooltip": "Sinais de tráfico de Mapillary (debes activar a superposición de fotos)",
+            "title": "Superposición de sinais de tráfico (Mapillary)"
         },
         "mapillary": {
             "view_on_mapillary": "Ver esta imaxe en Mapillary"
@@ -795,7 +795,7 @@
                     "william-towing": "William Towing",
                     "willow-drive": "Willow Drive",
                     "wood-street": "Wood Street",
-                    "world-fare": "Tarifa Mundial"
+                    "world-fare": "World Fare"
                 }
             },
             "welcome": {
@@ -1327,8 +1327,8 @@
                         "SSW": "Sur-suroeste",
                         "SW": "Suroeste",
                         "W": "Oeste",
-                        "WNW": "Oeste-noroeste",
-                        "WSW": "Oeste-suroeste"
+                        "WNW": "Oés-noroeste",
+                        "WSW": "Oés-suroeste"
                     }
                 },
                 "castle_type": {
@@ -1341,6 +1341,9 @@
                         "clockwise": "Sentido horario"
                     }
                 },
+                "clothes": {
+                    "label": "Roupa"
+                },
                 "club": {
                     "label": "Tipo"
                 },
@@ -1358,7 +1361,7 @@
                     "placeholder": "http://exemplo.gal/"
                 },
                 "content": {
-                    "label": "Contidos"
+                    "label": "Contido"
                 },
                 "country": {
                     "label": "País"
@@ -1527,6 +1530,10 @@
                 "generator/method": {
                     "label": "Método"
                 },
+                "generator/output/electricity": {
+                    "label": "Potencia de saída",
+                    "placeholder": "50 MW, 100 MW, 200 MW..."
+                },
                 "generator/source": {
                     "label": "Fonte"
                 },
@@ -1709,9 +1716,9 @@
                     "options": {
                         "0": "0: Grava sólida/terra compactada, sen obstáculos, curvas amplas",
                         "1": "1: Algunha superficie solta, pequenos obstáculos, curvas amplas",
-                        "2": "2: Moita superficie solta, grandes obstáculos, grapas fáciles",
-                        "3": "3: superficie escorregadia, grandes obstáculos, grapas axustadas",
-                        "4": "4: Superficie solta ou pedras, pinzas perigosas",
+                        "2": "2: Moita superficie solta, grandes obstáculos, curvas cerradas fáciles",
+                        "3": "3: Superficie escorregadia, grandes obstáculos, curvas cerradas axustadas",
+                        "4": "4: Superficie solta ou pedras, curvas cerradas perigosas",
                         "5": "5: Dificultade máxima, campos de pedras, desprendementos de terra",
                         "6": "6: Non practicable excepto polos mellores ciclistas de montaña"
                     },
@@ -1731,11 +1738,11 @@
                 "mtb/scale/uphill": {
                     "label": "Montain Bike Rutas de Subida",
                     "options": {
-                        "0": "0: Port. inclinación <10%, grava/terra batida, sen obstáculos",
-                        "1": "1: Port. inclinación <15%, grava/terra batida, algúns pequenos obxectos",
-                        "2": "2: Port. inclinación <20%, superficiais, rochas primarias/raíces estables",
-                        "3": "3: Port. inclinación <25%, superficie variable, rochas primarias/ramas",
-                        "4": "4: Port. inclinación <30%, mal estado, grandes rochas/ramas",
+                        "0": "0: Incl. media <10%, grava/terra batida, sen obstáculos",
+                        "1": "1: Incl. media <15%, grava/terra batida, algúns pequenos obxectos",
+                        "2": "2: Incl. media <20%, superficie estable, rochas de tamaño medio/raíces",
+                        "3": "3: Incl. media <25%, superficie variable, rochas de tamaño medio/ramas",
+                        "4": "4: Incl. media <30%, mal estado, grandes rochas/ramas",
                         "5": "5: Moi escarpado, a bicicleta en xeral, debe ser empuxada ou transportada"
                     },
                     "placeholder": "0, 1, 2, 3..."
@@ -1891,6 +1898,10 @@
                 "plant": {
                     "label": "Planta"
                 },
+                "plant/output/electricity": {
+                    "label": "Potencia de saída",
+                    "placeholder": "500 MW, 1000 MW, 2000 MW..."
+                },
                 "population": {
                     "label": "Poboación"
                 },
@@ -2020,7 +2031,7 @@
                     "options": {
                         "bad": "Rodas robustas: bicicleta de montaña, coche, rickshaw",
                         "excellent": "Rodas finas: patíns, skate",
-                        "good": "Rodas estreitas competición de bicicleta",
+                        "good": "Rodas estreitas: bicicleta de carreira",
                         "horrible": "Off-Road: vehículo pesado off-road",
                         "impassable": "Intransitable/Non vehículo de rodas",
                         "intermediate": "Rodas: Bicicleta de cidade, cadeiras de rodas, scooters",
@@ -2119,12 +2130,12 @@
                     "placeholder": "Si, Non, Para Levar Só..."
                 },
                 "toilets/disposal": {
-                    "label": "Dispoñible",
+                    "label": "Eliminación",
                     "options": {
                         "bucket": "Balde",
                         "chemical": "Química",
-                        "flush": "Enxuague",
-                        "pitlatrine": "Letrina de Pozo"
+                        "flush": "Cisterna",
+                        "pitlatrine": "Pozo/Letrina"
                     }
                 },
                 "toll": {
@@ -2138,7 +2149,7 @@
                 },
                 "tower/construction": {
                     "label": "Construción",
-                    "placeholder": "Guyed, Malla, Oculto, ..."
+                    "placeholder": "Cable, Malla, Oculto, ..."
                 },
                 "tower/type": {
                     "label": "Tipo"
@@ -2147,10 +2158,10 @@
                     "label": "Tipo de Pista",
                     "options": {
                         "grade1": "Sólido: superficie pavimentada ou fortemente compactada",
-                        "grade2": "Principalmente Solido: grava/roca con algún material brando mesturado",
+                        "grade2": "Principalmente Sólido: grava/rocha con algún material brando mesturado",
                         "grade3": "Mesma mestura de materiais duros e brandos",
-                        "grade4": "Principalmente Suave: solo/area/herba con algún material duro mesturado",
-                        "grade5": "Suave: solo/area/herba"
+                        "grade4": "Principalmente Brando: terra/area/herba con algún material duro mesturado",
+                        "grade5": "Brando: terra/area/herba"
                     },
                     "placeholder": "Sólido, Sobre todo Sólido, Suave ..."
                 },
@@ -2220,49 +2231,63 @@
             },
             "presets": {
                 "address": {
-                    "name": "Enderezo"
+                    "name": "Enderezo",
+                    "terms": "dirección"
                 },
                 "advertising/billboard": {
-                    "name": "Carteleira"
+                    "name": "Carteleira",
+                    "terms": "<translate with synonyms or related terms for 'Billboard', separated by commas>"
                 },
                 "aerialway": {
                     "name": "Vía Aérea"
                 },
                 "aerialway/cable_car": {
-                    "name": "Teleférico"
+                    "name": "Teleférico",
+                    "terms": "<translate with synonyms or related terms for 'Cable Car', separated by commas>"
                 },
                 "aerialway/chair_lift": {
-                    "name": "Ascensor de Cadeiras"
+                    "name": "Ascensor de Cadeiras",
+                    "terms": "<translate with synonyms or related terms for 'Chair Lift', separated by commas>"
                 },
                 "aerialway/drag_lift": {
-                    "name": "Ascensor de Arrastre"
+                    "name": "Ascensor de Arrastre",
+                    "terms": "<translate with synonyms or related terms for 'Drag Lift', separated by commas>"
                 },
                 "aerialway/gondola": {
-                    "name": "Góndola"
+                    "name": "Góndola",
+                    "terms": "<translate with synonyms or related terms for 'Gondola', separated by commas>"
                 },
                 "aerialway/goods": {
-                    "name": "Camiño aéreo de mercadorías"
+                    "name": "Camiño aéreo de mercadorías",
+                    "terms": "<translate with synonyms or related terms for 'Goods Aerialway', separated by commas>"
                 },
                 "aerialway/magic_carpet": {
-                    "name": "Ascensor Magic Carpet"
+                    "name": "Ascensor Magic Carpet",
+                    "terms": "<translate with synonyms or related terms for 'Magic Carpet Lift', separated by commas>"
                 },
                 "aerialway/mixed_lift": {
-                    "name": "Elevador Mixto"
+                    "name": "Elevador Mixto",
+                    "terms": "<translate with synonyms or related terms for 'Mixed Lift', separated by commas>"
                 },
                 "aerialway/platter": {
-                    "name": "Plataforma Elevadora"
+                    "name": "Plataforma Elevadora",
+                    "terms": "<translate with synonyms or related terms for 'Platter Lift', separated by commas>"
                 },
                 "aerialway/pylon": {
-                    "name": "Pilón Vía Aérea"
+                    "name": "Pilón Vía Aérea",
+                    "terms": "<translate with synonyms or related terms for 'Aerialway Pylon', separated by commas>"
                 },
                 "aerialway/rope_tow": {
-                    "name": "Ascensor de Corda de Remolque"
+                    "name": "Ascensor de Corda de Remolque",
+                    "terms": "<translate with synonyms or related terms for 'Rope Tow Lift', separated by commas>"
                 },
                 "aerialway/station": {
-                    "name": "Estación Vía Aérea"
+                    "name": "Estación Vía Aérea",
+                    "terms": "<translate with synonyms or related terms for 'Aerialway Station', separated by commas>"
                 },
                 "aerialway/t-bar": {
-                    "name": "Elevador en T-bar"
+                    "name": "Elevador en T-bar",
+                    "terms": "<translate with synonyms or related terms for 'T-bar Lift', separated by commas>"
                 },
                 "aeroway": {
                     "name": "Vía aérea"
@@ -2272,44 +2297,55 @@
                     "terms": "aeroporto, avión, aeródromo, terminal"
                 },
                 "aeroway/apron": {
-                    "name": "Diantal"
+                    "name": "Diantal",
+                    "terms": "<translate with synonyms or related terms for 'Apron', separated by commas>"
                 },
                 "aeroway/gate": {
-                    "name": "Aeroporto Porta"
+                    "name": "Aeroporto Porta",
+                    "terms": "<translate with synonyms or related terms for 'Airport Gate', separated by commas>"
                 },
                 "aeroway/hangar": {
-                    "name": "Hangar"
+                    "name": "Hangar",
+                    "terms": "<translate with synonyms or related terms for 'Hangar', separated by commas>"
                 },
                 "aeroway/helipad": {
                     "name": "Heliporto",
                     "terms": "heliporto, helicóptero"
                 },
                 "aeroway/runway": {
-                    "name": "Pista"
+                    "name": "Pista",
+                    "terms": "<translate with synonyms or related terms for 'Runway', separated by commas>"
                 },
                 "aeroway/taxiway": {
-                    "name": "Carril Taxi"
+                    "name": "Carril Taxi",
+                    "terms": "<translate with synonyms or related terms for 'Taxiway', separated by commas>"
                 },
                 "aeroway/terminal": {
-                    "name": "Aeroporto Terminal"
+                    "name": "Aeroporto Terminal",
+                    "terms": "<translate with synonyms or related terms for 'Airport Terminal', separated by commas>"
                 },
                 "amenity": {
                     "name": "Instalacións"
                 },
                 "amenity/animal_boarding": {
-                    "name": "Embarque de Animais"
+                    "name": "Embarque de Animais",
+                    "terms": "<translate with synonyms or related terms for 'Animal Boarding Facility', separated by commas>"
                 },
                 "amenity/animal_breeding": {
-                    "name": "Mellora Animal"
+                    "name": "Mellora Animal",
+                    "terms": "<translate with synonyms or related terms for 'Animal Breeding Facility', separated by commas>"
                 },
                 "amenity/animal_shelter": {
-                    "name": "Pousada Animal"
+                    "name": "Pousada Animal",
+                    "terms": "<translate with synonyms or related terms for 'Animal Shelter', separated by commas>"
                 },
                 "amenity/arts_centre": {
-                    "name": "Centro de Arte"
+                    "name": "Centro de Arte",
+                    "terms": "<translate with synonyms or related terms for 'Arts Center', separated by commas>"
                 },
                 "amenity/atm": {
-                    "name": "Caixeiro automático"
+                    "name": "Caixeiro automático",
+                    "terms": "<translate with synonyms or related terms for 'ATM', separated by commas>"
                 },
                 "amenity/bank": {
                     "name": "Banco",
@@ -2317,149 +2353,194 @@
                 },
                 "amenity/bar": {
                     "name": "Bar de copas",
-                    "terms": "pub, bar, bar de copas, bebidas"
+                    "terms": "pub, bar, bar de copas, bebidas, alcohol"
                 },
                 "amenity/bbq": {
-                    "name": "Barbacoa/Grella"
+                    "name": "Barbacoa/Grella",
+                    "terms": "<translate with synonyms or related terms for 'Barbecue/Grill', separated by commas>"
                 },
                 "amenity/bench": {
-                    "name": "Banco"
+                    "name": "Banco",
+                    "terms": "banco, asento, sentar"
                 },
                 "amenity/bicycle_parking": {
-                    "name": "Aparcadoiro de bicicletas"
+                    "name": "Aparcadoiro de bicicletas",
+                    "terms": "bicis, bicicletas, parking, aparcadoiro"
                 },
                 "amenity/bicycle_rental": {
-                    "name": "Alugamento de bicicletas"
+                    "name": "Alugamento de bicicletas",
+                    "terms": "<translate with synonyms or related terms for 'Bicycle Rental', separated by commas>"
                 },
                 "amenity/bicycle_repair_station": {
-                    "name": "Lugar para ferramentas de reparación de bicicletas"
+                    "name": "Lugar para ferramentas de reparación de bicicletas",
+                    "terms": "<translate with synonyms or related terms for 'Bicycle Repair Tool Stand', separated by commas>"
                 },
                 "amenity/biergarten": {
-                    "name": "Xardín da Cervexa"
+                    "name": "Xardín da Cervexa",
+                    "terms": "<translate with synonyms or related terms for 'Beer Garden', separated by commas>"
                 },
                 "amenity/boat_rental": {
-                    "name": "Aluguer de Botes"
+                    "name": "Aluguer de Botes",
+                    "terms": "<translate with synonyms or related terms for 'Boat Rental', separated by commas>"
                 },
                 "amenity/bureau_de_change": {
-                    "name": "Troco de Divisas"
+                    "name": "Troco de Divisas",
+                    "terms": "troco, cambio, divisa, moeda"
                 },
                 "amenity/bus_station": {
-                    "name": "Estación de autobuses"
+                    "name": "Estación de autobuses",
+                    "terms": "<translate with synonyms or related terms for 'Bus Station', separated by commas>"
                 },
                 "amenity/cafe": {
                     "name": "Cafetería",
-                    "terms": "cafetería, café, bar"
+                    "terms": "cafetería, café, bar, tetería"
                 },
                 "amenity/car_rental": {
-                    "name": "Aluguer de automóbiles"
+                    "name": "Aluguer de automóbiles",
+                    "terms": "<translate with synonyms or related terms for 'Car Rental', separated by commas>"
                 },
                 "amenity/car_sharing": {
-                    "name": "Auto Compartido"
+                    "name": "Auto Compartido",
+                    "terms": "<translate with synonyms or related terms for 'Car Sharing', separated by commas>"
                 },
                 "amenity/car_wash": {
-                    "name": "Lavado de automóbiles"
+                    "name": "Lavado de automóbiles",
+                    "terms": "<translate with synonyms or related terms for 'Car Wash', separated by commas>"
                 },
                 "amenity/casino": {
-                    "name": "Casino"
+                    "name": "Casino",
+                    "terms": "<translate with synonyms or related terms for 'Casino', separated by commas>"
                 },
                 "amenity/charging_station": {
-                    "name": "Estación de carga"
+                    "name": "Estación de carga",
+                    "terms": "<translate with synonyms or related terms for 'Charging Station', separated by commas>"
                 },
                 "amenity/childcare": {
-                    "name": "Cuidadora/niñeira"
+                    "name": "Cuidadora/niñeira",
+                    "terms": "<translate with synonyms or related terms for 'Nursery/Childcare', separated by commas>"
                 },
                 "amenity/cinema": {
-                    "name": "Cine"
+                    "name": "Cine",
+                    "terms": "cine, cinema, película, filme, pantalla"
                 },
                 "amenity/clinic": {
-                    "name": "Clínica"
+                    "name": "Clínica",
+                    "terms": "clínica, médico, saúde, urxencias"
                 },
                 "amenity/clock": {
-                    "name": "Reloxo"
+                    "name": "Reloxo",
+                    "terms": "<translate with synonyms or related terms for 'Clock', separated by commas>"
                 },
                 "amenity/college": {
-                    "name": "Zona Universitaria"
+                    "name": "Zona Universitaria",
+                    "terms": "<translate with synonyms or related terms for 'College Grounds', separated by commas>"
                 },
                 "amenity/community_centre": {
-                    "name": "Centro Comunitario"
+                    "name": "Centro Comunitario",
+                    "terms": "<translate with synonyms or related terms for 'Community Center', separated by commas>"
                 },
                 "amenity/compressed_air": {
-                    "name": "Aire Comprimido"
+                    "name": "Aire Comprimido",
+                    "terms": "<translate with synonyms or related terms for 'Compressed Air', separated by commas>"
                 },
                 "amenity/courthouse": {
-                    "name": "Pazo de xustiza"
+                    "name": "Pazo de xustiza",
+                    "terms": "<translate with synonyms or related terms for 'Courthouse', separated by commas>"
                 },
                 "amenity/coworking_space": {
                     "name": "Espacio de Cotraballo"
                 },
                 "amenity/crematorium": {
-                    "name": "Crematorio"
+                    "name": "Crematorio",
+                    "terms": "<translate with synonyms or related terms for 'Crematorium', separated by commas>"
                 },
                 "amenity/dentist": {
-                    "name": "Dentista"
+                    "name": "Dentista",
+                    "terms": "<translate with synonyms or related terms for 'Dentist', separated by commas>"
                 },
                 "amenity/doctors": {
-                    "name": "Doutor"
+                    "name": "Doutor",
+                    "terms": "doutor, médico, clínica, saúde"
                 },
                 "amenity/dojo": {
-                    "name": "Dojo/Academia de Artes Marciais"
+                    "name": "Dojo/Academia de Artes Marciais",
+                    "terms": "<translate with synonyms or related terms for 'Dojo / Martial Arts Academy', separated by commas>"
                 },
                 "amenity/drinking_water": {
-                    "name": "Fonte"
+                    "name": "Fonte",
+                    "terms": "fonte, auga, potable, beber"
                 },
                 "amenity/driving_school": {
-                    "name": "Autoescola"
+                    "name": "Autoescola",
+                    "terms": "<translate with synonyms or related terms for 'Driving School', separated by commas>"
                 },
                 "amenity/embassy": {
-                    "name": "Embaixada"
+                    "name": "Embaixada",
+                    "terms": "<translate with synonyms or related terms for 'Embassy', separated by commas>"
                 },
                 "amenity/fast_food": {
-                    "name": "Comida Rápida"
+                    "name": "Comida Rápida",
+                    "terms": "<translate with synonyms or related terms for 'Fast Food', separated by commas>"
                 },
                 "amenity/ferry_terminal": {
-                    "name": "Terminal Ferry"
+                    "name": "Terminal Ferry",
+                    "terms": "<translate with synonyms or related terms for 'Ferry Terminal', separated by commas>"
                 },
                 "amenity/fire_station": {
-                    "name": "Parque de bombeiros"
+                    "name": "Parque de bombeiros",
+                    "terms": "<translate with synonyms or related terms for 'Fire Station', separated by commas>"
                 },
                 "amenity/food_court": {
-                    "name": "Zona de Comidas"
+                    "name": "Zona de Comidas",
+                    "terms": "<translate with synonyms or related terms for 'Food Court', separated by commas>"
                 },
                 "amenity/fountain": {
-                    "name": "Fonte ornamental"
+                    "name": "Fonte ornamental",
+                    "terms": "<translate with synonyms or related terms for 'Fountain', separated by commas>"
                 },
                 "amenity/fuel": {
-                    "name": "Gasolineira"
+                    "name": "Gasolineira",
+                    "terms": "<translate with synonyms or related terms for 'Gas Station', separated by commas>"
                 },
                 "amenity/grave_yard": {
-                    "name": "Cemiterio"
+                    "name": "Cemiterio",
+                    "terms": "<translate with synonyms or related terms for 'Graveyard', separated by commas>"
                 },
                 "amenity/grit_bin": {
-                    "name": "Papeleira"
+                    "name": "Contenedor de sal",
+                    "terms": "<translate with synonyms or related terms for 'Grit Bin', separated by commas>"
                 },
                 "amenity/hospital": {
-                    "name": "Hospital"
+                    "name": "Hospital",
+                    "terms": "<translate with synonyms or related terms for 'Hospital Grounds', separated by commas>"
                 },
                 "amenity/hunting_stand": {
-                    "name": "Stand de Caza"
+                    "name": "Stand de Caza",
+                    "terms": "<translate with synonyms or related terms for 'Hunting Stand', separated by commas>"
                 },
                 "amenity/ice_cream": {
-                    "name": "Xeladería"
+                    "name": "Xeladería",
+                    "terms": "<translate with synonyms or related terms for 'Ice Cream Shop', separated by commas>"
                 },
                 "amenity/internet_cafe": {
-                    "name": "Internet Café"
+                    "name": "Cibercafé",
+                    "terms": "ciber, internet, ordenador"
                 },
                 "amenity/kindergarten": {
-                    "name": "Preescolar/Xardín de Infancia Terreos"
+                    "name": "Preescolar/Xardín de Infancia Terreos",
+                    "terms": "preescolar, xardín de infancia, guardería, infantil, párvulos"
                 },
                 "amenity/library": {
-                    "name": "Biblioteca"
+                    "name": "Biblioteca",
+                    "terms": "<translate with synonyms or related terms for 'Library', separated by commas>"
                 },
                 "amenity/marketplace": {
-                    "name": "Mercado"
+                    "name": "Mercado",
+                    "terms": "<translate with synonyms or related terms for 'Marketplace', separated by commas>"
                 },
                 "amenity/motorcycle_parking": {
-                    "name": "Aparcamento de Motos"
+                    "name": "Aparcamento de Motos",
+                    "terms": "<translate with synonyms or related terms for 'Motorcycle Parking', separated by commas>"
                 },
                 "amenity/nightclub": {
                     "name": "Pub",
@@ -2469,39 +2550,64 @@
                     "name": "Residencia de Anciáns"
                 },
                 "amenity/parking": {
-                    "name": "Aparcadoiro de automóbiles"
+                    "name": "Aparcadoiro de automóbiles",
+                    "terms": "aparcadoiro, aparcamento, parking"
                 },
                 "amenity/parking_entrance": {
-                    "name": "Garaxe Aparcamento Entrada/Saída"
+                    "name": "Garaxe Aparcamento Entrada/Saída",
+                    "terms": "<translate with synonyms or related terms for 'Parking Garage Entrance/Exit', separated by commas>"
                 },
                 "amenity/parking_space": {
-                    "name": "Espazo de Aparcamento"
+                    "name": "Espazo de Aparcamento",
+                    "terms": "<translate with synonyms or related terms for 'Parking Space', separated by commas>"
                 },
                 "amenity/pavilion": {
-                    "name": "Pavillón"
+                    "name": "Pavillón",
+                    "terms": "<translate with synonyms or related terms for 'Pavilion', separated by commas>"
                 },
                 "amenity/pharmacy": {
-                    "name": "Farmacia"
+                    "name": "Farmacia",
+                    "terms": "<translate with synonyms or related terms for 'Pharmacy', separated by commas>"
                 },
                 "amenity/place_of_worship": {
                     "name": "Lugar de culto",
                     "terms": "lugar de culto, igrexa, templo, capela, basílica, parroquia, santuario, ermida, catedral, sinagoga, mesquita"
                 },
                 "amenity/place_of_worship/buddhist": {
-                    "name": "Templo Budista"
+                    "name": "Templo Budista",
+                    "terms": "<translate with synonyms or related terms for 'Buddhist Temple', separated by commas>"
                 },
                 "amenity/place_of_worship/christian": {
                     "name": "Igrexa",
                     "terms": "igrexa, capela, parroquia, templo, ermida, santuario"
                 },
+                "amenity/place_of_worship/hindu": {
+                    "name": "Templo Hindú",
+                    "terms": "<translate with synonyms or related terms for 'Hindu Temple', separated by commas>"
+                },
                 "amenity/place_of_worship/jewish": {
-                    "name": "Sinagoga"
+                    "name": "Sinagoga",
+                    "terms": "<translate with synonyms or related terms for 'Synagogue', separated by commas>"
                 },
                 "amenity/place_of_worship/muslim": {
-                    "name": "Mesquita"
+                    "name": "Mesquita",
+                    "terms": "<translate with synonyms or related terms for 'Mosque', separated by commas>"
+                },
+                "amenity/place_of_worship/shinto": {
+                    "name": "Santuario sintoísta",
+                    "terms": "<translate with synonyms or related terms for 'Shinto Shrine', separated by commas>"
+                },
+                "amenity/place_of_worship/sikh": {
+                    "name": "Templo Sikh",
+                    "terms": "<translate with synonyms or related terms for 'Sikh Temple', separated by commas>"
+                },
+                "amenity/place_of_worship/taoist": {
+                    "name": "Templo Taoista",
+                    "terms": "<translate with synonyms or related terms for 'Taoist Temple', separated by commas>"
                 },
                 "amenity/planetarium": {
-                    "name": "Planetario"
+                    "name": "Planetario",
+                    "terms": "<translate with synonyms or related terms for 'Planetarium', separated by commas>"
                 },
                 "amenity/police": {
                     "name": "Policía",
@@ -2512,29 +2618,36 @@
                     "terms": "correo, buzón, correos, mensaxería, postal"
                 },
                 "amenity/post_office": {
-                    "name": "Oficina de Correos"
+                    "name": "Oficina de Correos",
+                    "terms": "<translate with synonyms or related terms for 'Post Office', separated by commas>"
                 },
                 "amenity/prison": {
-                    "name": "Penitenciaria"
+                    "name": "Penitenciaria",
+                    "terms": "<translate with synonyms or related terms for 'Prison Grounds', separated by commas>"
                 },
                 "amenity/pub": {
                     "name": "Bar",
                     "terms": "Pub, bar, café, cafetería"
                 },
                 "amenity/public_bath": {
-                    "name": "Baño Público"
+                    "name": "Baño Público",
+                    "terms": "<translate with synonyms or related terms for 'Public Bath', separated by commas>"
                 },
                 "amenity/public_bookcase": {
-                    "name": "Estantería Pública"
+                    "name": "Estantería Pública",
+                    "terms": "<translate with synonyms or related terms for 'Public Bookcase', separated by commas>"
                 },
                 "amenity/ranger_station": {
-                    "name": "Garda Bosques Estación"
+                    "name": "Garda Bosques Estación",
+                    "terms": "<translate with synonyms or related terms for 'Ranger Station', separated by commas>"
                 },
                 "amenity/recycling": {
-                    "name": "Reciclaxe"
+                    "name": "Reciclaxe",
+                    "terms": "reciclaxe, contenedor, lixo, basura, orgánico, plásticos, vidrio, punto limpo"
                 },
                 "amenity/recycling_centre": {
-                    "name": "Centro de Reciclaxe"
+                    "name": "Centro de Reciclaxe",
+                    "terms": "centro de reciclaxe, punto limpo"
                 },
                 "amenity/register_office": {
                     "name": "Oficina de Rexistro"
@@ -2544,442 +2657,578 @@
                     "terms": "restaurante, mesón, taberna, comedor, comida, comer, xantar, cear, menú"
                 },
                 "amenity/sanitary_dump_station": {
-                    "name": "RV WC Eliminación"
+                    "name": "RV WC Eliminación",
+                    "terms": "<translate with synonyms or related terms for 'RV Toilet Disposal', separated by commas>"
                 },
                 "amenity/school": {
                     "name": "Escola Terreos",
                     "terms": "escola, colexio, instituto, educación, ensinanza, primaria, secundaria, ESO, bacharelato"
                 },
                 "amenity/scrapyard": {
-                    "name": "Depósito de Chatarra"
+                    "name": "Depósito de Chatarra",
+                    "terms": "<translate with synonyms or related terms for 'Scrap Yard', separated by commas>"
                 },
                 "amenity/shelter": {
-                    "name": "Abrigo"
+                    "name": "Abrigo",
+                    "terms": "<translate with synonyms or related terms for 'Shelter', separated by commas>"
                 },
                 "amenity/social_facility": {
-                    "name": "Axuda Social"
+                    "name": "Axuda Social",
+                    "terms": "<translate with synonyms or related terms for 'Social Facility', separated by commas>"
                 },
                 "amenity/social_facility/food_bank": {
-                    "name": "Banco de Alimentos"
+                    "name": "Banco de Alimentos",
+                    "terms": "<translate with synonyms or related terms for 'Food Bank', separated by commas>"
                 },
                 "amenity/social_facility/group_home": {
-                    "name": "Grupo de Vellos Fogar"
+                    "name": "Grupo de Vellos Fogar",
+                    "terms": "<translate with synonyms or related terms for 'Elderly Group Home', separated by commas>"
                 },
                 "amenity/social_facility/homeless_shelter": {
-                    "name": "Refuxio para Indixentes"
+                    "name": "Refuxio para Indixentes",
+                    "terms": "<translate with synonyms or related terms for 'Homeless Shelter', separated by commas>"
                 },
                 "amenity/social_facility/nursing_home": {
-                    "name": "Residencia de Anciáns"
+                    "name": "Residencia de Anciáns",
+                    "terms": "<translate with synonyms or related terms for 'Nursing Home', separated by commas>"
                 },
                 "amenity/studio": {
-                    "name": "Estudio"
+                    "name": "Estudio",
+                    "terms": "<translate with synonyms or related terms for 'Studio', separated by commas>"
                 },
                 "amenity/swimming_pool": {
                     "name": "Piscina"
                 },
                 "amenity/taxi": {
-                    "name": "Parada de taxis"
+                    "name": "Parada de taxis",
+                    "terms": "<translate with synonyms or related terms for 'Taxi Stand', separated by commas>"
                 },
                 "amenity/telephone": {
-                    "name": "Teléfono"
+                    "name": "Teléfono",
+                    "terms": "teléfono, chamadas, cabina"
                 },
                 "amenity/theatre": {
-                    "name": "Teatro"
+                    "name": "Teatro",
+                    "terms": "<translate with synonyms or related terms for 'Theater', separated by commas>"
                 },
                 "amenity/toilets": {
-                    "name": "Aseos"
+                    "name": "Aseos",
+                    "terms": "aseos, baños, WC"
                 },
                 "amenity/townhall": {
                     "name": "Casa do Concello",
                     "terms": "casa do concello, concello, consistorio, municipio, municipal, cabido"
                 },
                 "amenity/university": {
-                    "name": "Campus"
+                    "name": "Campus",
+                    "terms": "campus, universidade"
                 },
                 "amenity/vending_machine": {
-                    "name": "Máquina de Vending"
+                    "name": "Máquina de Vending",
+                    "terms": "vending, expendedora"
                 },
                 "amenity/vending_machine/cigarettes": {
-                    "name": "Expendedora de Tabaco"
+                    "name": "Expendedora de Tabaco",
+                    "terms": "<translate with synonyms or related terms for 'Cigarette Vending Machine', separated by commas>"
                 },
                 "amenity/vending_machine/condoms": {
-                    "name": "Expendedora de Condóns"
+                    "name": "Expendedora de Condóns",
+                    "terms": "<translate with synonyms or related terms for 'Condom Vending Machine', separated by commas>"
                 },
                 "amenity/vending_machine/drinks": {
-                    "name": "Mánquina de Vending, Bebidas"
+                    "name": "Mánquina de Vending, Bebidas",
+                    "terms": "<translate with synonyms or related terms for 'Drink Vending Machine', separated by commas>"
                 },
                 "amenity/vending_machine/excrement_bags": {
-                    "name": "Caca Can"
+                    "name": "Caca Can",
+                    "terms": "<translate with synonyms or related terms for 'Excrement Bag Vending Machine', separated by commas>"
                 },
                 "amenity/vending_machine/news_papers": {
                     "name": "Expendedora de Xornais"
                 },
                 "amenity/vending_machine/newspapers": {
-                    "name": "Máquina Expendedora de Xornais"
+                    "name": "Máquina Expendedora de Xornais",
+                    "terms": "<translate with synonyms or related terms for 'Newspaper Vending Machine', separated by commas>"
                 },
                 "amenity/vending_machine/parcel_pickup_dropoff": {
-                    "name": "Máquina expendedora de recollida/entrega de paquetes"
+                    "name": "Máquina expendedora de recollida/entrega de paquetes",
+                    "terms": "<translate with synonyms or related terms for 'Parcel Pickup/Dropoff Vending Machine', separated by commas>"
                 },
                 "amenity/vending_machine/parking_tickets": {
-                    "name": "Máquina Parquímetro"
+                    "name": "Máquina Parquímetro",
+                    "terms": "<translate with synonyms or related terms for 'Parking Ticket Vending Machine', separated by commas>"
                 },
                 "amenity/vending_machine/public_transport_tickets": {
-                    "name": "Expendedora Tickets de Tránsito"
+                    "name": "Expendedora Tickets de Tránsito",
+                    "terms": "<translate with synonyms or related terms for 'Transit Ticket Vending Machine', separated by commas>"
                 },
                 "amenity/vending_machine/sweets": {
-                    "name": "Expendedora de Snacks"
+                    "name": "Expendedora de Snacks",
+                    "terms": "<translate with synonyms or related terms for 'Snack Vending Machine', separated by commas>"
                 },
                 "amenity/veterinary": {
-                    "name": "Veterinario"
+                    "name": "Veterinario",
+                    "terms": "<translate with synonyms or related terms for 'Veterinary', separated by commas>"
+                },
+                "amenity/waste/dog_excrement": {
+                    "name": "Cacacan",
+                    "terms": "<translate with synonyms or related terms for 'Dog Excrement Bin', separated by commas>"
                 },
                 "amenity/waste_basket": {
                     "name": "Papeleira",
                     "terms": "papeleira, lixo, basura"
                 },
                 "amenity/waste_disposal": {
-                    "name": "Vertedeiro"
+                    "name": "Vertedeiro",
+                    "terms": "<translate with synonyms or related terms for 'Garbage Dumpster', separated by commas>"
                 },
                 "amenity/waste_transfer_station": {
-                    "name": "Estación de Bombeo Augas Residuais"
+                    "name": "Estación de Bombeo Augas Residuais",
+                    "terms": "<translate with synonyms or related terms for 'Waste Transfer Station', separated by commas>"
                 },
                 "amenity/water_point": {
-                    "name": "Auga potable de RV"
+                    "name": "Auga potable de RV",
+                    "terms": "<translate with synonyms or related terms for 'RV Drinking Water', separated by commas>"
                 },
                 "amenity/watering_place": {
-                    "name": "Bebedoiro de animais"
+                    "name": "Bebedoiro de animais",
+                    "terms": "<translate with synonyms or related terms for 'Animal Watering Place', separated by commas>"
                 },
                 "area": {
-                    "name": "Área"
+                    "name": "Área",
+                    "terms": "<translate with synonyms or related terms for 'Area', separated by commas>"
                 },
                 "area/highway": {
-                    "name": "Superficie da Estrada"
+                    "name": "Superficie da Estrada",
+                    "terms": "<translate with synonyms or related terms for 'Road Surface', separated by commas>"
                 },
                 "barrier": {
-                    "name": "Barreira"
+                    "name": "Barreira",
+                    "terms": "<translate with synonyms or related terms for 'Barrier', separated by commas>"
                 },
                 "barrier/block": {
-                    "name": "Bloque"
+                    "name": "Bloque",
+                    "terms": "<translate with synonyms or related terms for 'Block', separated by commas>"
                 },
                 "barrier/bollard": {
-                    "name": "Bolardo"
+                    "name": "Bolardo",
+                    "terms": "<translate with synonyms or related terms for 'Bollard', separated by commas>"
                 },
                 "barrier/border_control": {
-                    "name": "Alfándega"
+                    "name": "Alfándega",
+                    "terms": "<translate with synonyms or related terms for 'Border Control', separated by commas>"
                 },
                 "barrier/cattle_grid": {
-                    "name": "Reixa de Retención"
+                    "name": "Reixa de Retención",
+                    "terms": "<translate with synonyms or related terms for 'Cattle Grid', separated by commas>"
                 },
                 "barrier/city_wall": {
-                    "name": "Muralla"
+                    "name": "Muralla",
+                    "terms": "<translate with synonyms or related terms for 'City Wall', separated by commas>"
                 },
                 "barrier/cycle_barrier": {
-                    "name": "Barreira Ciclista"
+                    "name": "Barreira Ciclista",
+                    "terms": "<translate with synonyms or related terms for 'Cycle Barrier', separated by commas>"
                 },
                 "barrier/ditch": {
-                    "name": "Trincheira"
+                    "name": "Trincheira",
+                    "terms": "<translate with synonyms or related terms for 'Trench', separated by commas>"
                 },
                 "barrier/entrance": {
                     "name": "Entrada"
                 },
                 "barrier/fence": {
-                    "name": "Valado"
+                    "name": "Valado",
+                    "terms": "<translate with synonyms or related terms for 'Fence', separated by commas>"
                 },
                 "barrier/gate": {
-                    "name": "Porta"
+                    "name": "Porta",
+                    "terms": "<translate with synonyms or related terms for 'Gate', separated by commas>"
                 },
                 "barrier/hedge": {
-                    "name": "Cobertura"
+                    "name": "Cobertura",
+                    "terms": "<translate with synonyms or related terms for 'Hedge', separated by commas>"
                 },
                 "barrier/kissing_gate": {
-                    "name": "Porta Kissing"
+                    "name": "Porta Kissing",
+                    "terms": "<translate with synonyms or related terms for 'Kissing Gate', separated by commas>"
                 },
                 "barrier/lift_gate": {
-                    "name": "Barreira levadiza"
+                    "name": "Barreira levadiza",
+                    "terms": "<translate with synonyms or related terms for 'Lift Gate', separated by commas>"
                 },
                 "barrier/retaining_wall": {
-                    "name": "Muro de contención"
+                    "name": "Muro de contención",
+                    "terms": "<translate with synonyms or related terms for 'Retaining Wall', separated by commas>"
                 },
                 "barrier/stile": {
-                    "name": "Escada"
+                    "name": "Escada",
+                    "terms": "<translate with synonyms or related terms for 'Stile', separated by commas>"
                 },
                 "barrier/toll_booth": {
-                    "name": "Peaxe"
+                    "name": "Peaxe",
+                    "terms": "<translate with synonyms or related terms for 'Toll Booth', separated by commas>"
                 },
                 "barrier/wall": {
-                    "name": "Muro"
+                    "name": "Muro",
+                    "terms": "<translate with synonyms or related terms for 'Wall', separated by commas>"
                 },
                 "boundary/administrative": {
-                    "name": "Límite administrativo"
+                    "name": "Límite administrativo",
+                    "terms": "<translate with synonyms or related terms for 'Administrative Boundary', separated by commas>"
                 },
                 "building": {
-                    "name": "Edificio"
+                    "name": "Edificio",
+                    "terms": "<translate with synonyms or related terms for 'Building', separated by commas>"
                 },
                 "building/apartments": {
-                    "name": "Apartamentos"
+                    "name": "Apartamentos",
+                    "terms": "<translate with synonyms or related terms for 'Apartments', separated by commas>"
                 },
                 "building/barn": {
-                    "name": "Celeiro-Hórreo"
+                    "name": "Celeiro/Hórreo",
+                    "terms": "celeiro, hórreo, cabazo, cabaceiro, cabaceira, piorno"
                 },
                 "building/bunker": {
                     "name": "Bunker"
                 },
                 "building/cabin": {
-                    "name": "Cabina"
+                    "name": "Cabina",
+                    "terms": "<translate with synonyms or related terms for 'Cabin', separated by commas>"
                 },
                 "building/cathedral": {
-                    "name": "Catedral Edificio"
+                    "name": "Catedral Edificio",
+                    "terms": "<translate with synonyms or related terms for 'Cathedral Building', separated by commas>"
                 },
                 "building/chapel": {
-                    "name": "Capela Edificio"
+                    "name": "Capela Edificio",
+                    "terms": "<translate with synonyms or related terms for 'Chapel Building', separated by commas>"
                 },
                 "building/church": {
-                    "name": "Igrexa edificio"
+                    "name": "Igrexa edificio",
+                    "terms": "<translate with synonyms or related terms for 'Church Building', separated by commas>"
                 },
                 "building/college": {
-                    "name": "Colexio edificio"
+                    "name": "Colexio edificio",
+                    "terms": "<translate with synonyms or related terms for 'College Building', separated by commas>"
                 },
                 "building/commercial": {
-                    "name": "Comercial edificio"
+                    "name": "Comercial edificio",
+                    "terms": "<translate with synonyms or related terms for 'Commercial Building', separated by commas>"
                 },
                 "building/construction": {
-                    "name": "Edificio en Construción"
+                    "name": "Edificio en Construción",
+                    "terms": "<translate with synonyms or related terms for 'Building Under Construction', separated by commas>"
                 },
                 "building/detached": {
-                    "name": "Casa Illada"
+                    "name": "Casa Illada",
+                    "terms": "<translate with synonyms or related terms for 'Detached House', separated by commas>"
                 },
                 "building/dormitory": {
-                    "name": "Dormitorio"
+                    "name": "Dormitorio",
+                    "terms": "<translate with synonyms or related terms for 'Dormitory', separated by commas>"
                 },
                 "building/entrance": {
                     "name": "Entrada/Saída"
                 },
                 "building/garage": {
-                    "name": "Garaxe"
+                    "name": "Garaxe",
+                    "terms": "<translate with synonyms or related terms for 'Garage', separated by commas>"
                 },
                 "building/garages": {
-                    "name": "Garaxes"
+                    "name": "Garaxes",
+                    "terms": "<translate with synonyms or related terms for 'Garages', separated by commas>"
                 },
                 "building/greenhouse": {
-                    "name": "invernadoiro"
+                    "name": "invernadoiro",
+                    "terms": "<translate with synonyms or related terms for 'Greenhouse', separated by commas>"
                 },
                 "building/hospital": {
-                    "name": "Hospital edificio"
+                    "name": "Hospital edificio",
+                    "terms": "<translate with synonyms or related terms for 'Hospital Building', separated by commas>"
                 },
                 "building/hotel": {
-                    "name": "Hotel edificio"
+                    "name": "Hotel edificio",
+                    "terms": "<translate with synonyms or related terms for 'Hotel Building', separated by commas>"
                 },
                 "building/house": {
-                    "name": "Casa"
+                    "name": "Casa",
+                    "terms": "<translate with synonyms or related terms for 'House', separated by commas>"
                 },
                 "building/hut": {
-                    "name": "Refuxio"
+                    "name": "Refuxio",
+                    "terms": "<translate with synonyms or related terms for 'Hut', separated by commas>"
                 },
                 "building/industrial": {
-                    "name": "Edificio Industrial"
+                    "name": "Edificio Industrial",
+                    "terms": "<translate with synonyms or related terms for 'Industrial Building', separated by commas>"
                 },
                 "building/kindergarten": {
-                    "name": "Preescolar/Xardín de Infancia Edificio"
+                    "name": "Preescolar/Xardín de Infancia Edificio",
+                    "terms": "<translate with synonyms or related terms for 'Preschool/Kindergarten Building', separated by commas>"
                 },
                 "building/public": {
-                    "name": "Público Edificio"
+                    "name": "Público Edificio",
+                    "terms": "<translate with synonyms or related terms for 'Public Building', separated by commas>"
                 },
                 "building/residential": {
-                    "name": "Edificio Residencial"
+                    "name": "Edificio Residencial",
+                    "terms": "<translate with synonyms or related terms for 'Residential Building', separated by commas>"
                 },
                 "building/retail": {
-                    "name": "Minorista Edificio"
+                    "name": "Minorista Edificio",
+                    "terms": "<translate with synonyms or related terms for 'Retail Building', separated by commas>"
                 },
                 "building/roof": {
-                    "name": "Tellado"
+                    "name": "Tellado",
+                    "terms": "<translate with synonyms or related terms for 'Roof', separated by commas>"
                 },
                 "building/school": {
-                    "name": "Escola Edificio"
+                    "name": "Escola Edificio",
+                    "terms": "<translate with synonyms or related terms for 'School Building', separated by commas>"
                 },
                 "building/semidetached_house": {
-                    "name": "Casa Adosada"
+                    "name": "Casa Adosada",
+                    "terms": "<translate with synonyms or related terms for 'Semi-Detached House', separated by commas>"
                 },
                 "building/shed": {
-                    "name": "Galpón"
+                    "name": "Galpón",
+                    "terms": "<translate with synonyms or related terms for 'Shed', separated by commas>"
                 },
                 "building/stable": {
-                    "name": "Estable"
+                    "name": "Estable",
+                    "terms": "<translate with synonyms or related terms for 'Stable', separated by commas>"
                 },
                 "building/static_caravan": {
-                    "name": "Casa Móbil Estática"
+                    "name": "Casa Móbil Estática",
+                    "terms": "<translate with synonyms or related terms for 'Static Mobile Home', separated by commas>"
                 },
                 "building/terrace": {
-                    "name": "Casas en fila"
+                    "name": "Casas en fila",
+                    "terms": "<translate with synonyms or related terms for 'Row Houses', separated by commas>"
                 },
                 "building/train_station": {
                     "name": "Estación de tren"
                 },
                 "building/university": {
-                    "name": "Edificio Universitario"
+                    "name": "Edificio Universitario",
+                    "terms": "<translate with synonyms or related terms for 'University Building', separated by commas>"
                 },
                 "building/warehouse": {
-                    "name": "Almacén"
+                    "name": "Almacén",
+                    "terms": "<translate with synonyms or related terms for 'Warehouse', separated by commas>"
                 },
                 "camp_site/camp_pitch": {
-                    "name": "Campamento Pitch"
+                    "name": "Campamento Pitch",
+                    "terms": "<translate with synonyms or related terms for 'Camp Pitch', separated by commas>"
                 },
                 "club": {
-                    "name": "Clube"
+                    "name": "Clube",
+                    "terms": "<translate with synonyms or related terms for 'Club', separated by commas>"
                 },
                 "craft": {
-                    "name": "Oficio"
+                    "name": "Oficio",
+                    "terms": "<translate with synonyms or related terms for 'Craft', separated by commas>"
                 },
                 "craft/basket_maker": {
-                    "name": "Cesteiría"
+                    "name": "Cesteiría",
+                    "terms": "<translate with synonyms or related terms for 'Basket Maker', separated by commas>"
                 },
                 "craft/beekeeper": {
-                    "name": "Apicultor"
+                    "name": "Apicultor",
+                    "terms": "<translate with synonyms or related terms for 'Beekeeper', separated by commas>"
                 },
                 "craft/blacksmith": {
-                    "name": "Ferreiro"
+                    "name": "Ferreiro",
+                    "terms": "<translate with synonyms or related terms for 'Blacksmith', separated by commas>"
                 },
                 "craft/boatbuilder": {
-                    "name": "Carpinteiro de Ribeira"
+                    "name": "Carpinteiro de Ribeira",
+                    "terms": "<translate with synonyms or related terms for 'Boat Builder', separated by commas>"
                 },
                 "craft/bookbinder": {
-                    "name": "Encadernador"
+                    "name": "Encadernador",
+                    "terms": "<translate with synonyms or related terms for 'Bookbinder', separated by commas>"
                 },
                 "craft/brewery": {
-                    "name": "Cervexa"
+                    "name": "Cervexa",
+                    "terms": "<translate with synonyms or related terms for 'Brewery', separated by commas>"
                 },
                 "craft/carpenter": {
-                    "name": "Carpinteiro"
+                    "name": "Carpinteiro",
+                    "terms": "<translate with synonyms or related terms for 'Carpenter', separated by commas>"
                 },
                 "craft/carpet_layer": {
-                    "name": "Capa de Alfombra"
+                    "name": "Capa de Alfombra",
+                    "terms": "<translate with synonyms or related terms for 'Carpet Layer', separated by commas>"
                 },
                 "craft/caterer": {
-                    "name": "Provedor"
+                    "name": "Provedor",
+                    "terms": "<translate with synonyms or related terms for 'Caterer', separated by commas>"
                 },
                 "craft/clockmaker": {
-                    "name": "Reloxeiro"
+                    "name": "Reloxeiro",
+                    "terms": "<translate with synonyms or related terms for 'Clockmaker', separated by commas>"
                 },
                 "craft/confectionery": {
-                    "name": "Repostería"
+                    "name": "Repostería",
+                    "terms": "<translate with synonyms or related terms for 'Confectionery', separated by commas>"
                 },
                 "craft/distillery": {
-                    "name": "Destilaría"
+                    "name": "Destilaría",
+                    "terms": "<translate with synonyms or related terms for 'Distillery', separated by commas>"
                 },
                 "craft/dressmaker": {
-                    "name": "Costureiro/a"
+                    "name": "Costureiro/a",
+                    "terms": "<translate with synonyms or related terms for 'Dressmaker', separated by commas>"
                 },
                 "craft/electrician": {
-                    "name": "Electricista"
+                    "name": "Electricista",
+                    "terms": "<translate with synonyms or related terms for 'Electrician', separated by commas>"
                 },
                 "craft/electronics_repair": {
-                    "name": "Tenda de Reparacións Electrónicas"
+                    "name": "Tenda de Reparacións Electrónicas",
+                    "terms": "<translate with synonyms or related terms for 'Electronics Repair Shop', separated by commas>"
                 },
                 "craft/gardener": {
-                    "name": "Xardineiro/a"
+                    "name": "Xardineiro/a",
+                    "terms": "<translate with synonyms or related terms for 'Gardener', separated by commas>"
                 },
                 "craft/glaziery": {
-                    "name": "Glaciar"
+                    "name": "Glaciar",
+                    "terms": "<translate with synonyms or related terms for 'Glaziery', separated by commas>"
                 },
                 "craft/handicraft": {
-                    "name": "Artesanía"
+                    "name": "Artesanía",
+                    "terms": "<translate with synonyms or related terms for 'Handicraft', separated by commas>"
                 },
                 "craft/hvac": {
-                    "name": "HVAC"
+                    "name": "HVAC",
+                    "terms": "<translate with synonyms or related terms for 'HVAC', separated by commas>"
                 },
                 "craft/insulator": {
-                    "name": "Illador"
+                    "name": "Illador",
+                    "terms": "<translate with synonyms or related terms for 'Insulator', separated by commas>"
                 },
                 "craft/jeweler": {
                     "name": "Xoieiro"
                 },
                 "craft/key_cutter": {
-                    "name": "Copiado de Chaves"
+                    "name": "Copiado de Chaves",
+                    "terms": "<translate with synonyms or related terms for 'Key Cutter', separated by commas>"
                 },
                 "craft/locksmith": {
                     "name": "Cerraxeiro"
                 },
                 "craft/metal_construction": {
-                    "name": "Metal Construción"
+                    "name": "Metal Construción",
+                    "terms": "<translate with synonyms or related terms for 'Metal Construction', separated by commas>"
                 },
                 "craft/optician": {
                     "name": "Óptico"
                 },
                 "craft/painter": {
-                    "name": "Pintor"
+                    "name": "Pintor",
+                    "terms": "<translate with synonyms or related terms for 'Painter', separated by commas>"
                 },
                 "craft/photographer": {
-                    "name": "Fotógrafo"
+                    "name": "Fotógrafo",
+                    "terms": "<translate with synonyms or related terms for 'Photographer', separated by commas>"
                 },
                 "craft/photographic_laboratory": {
-                    "name": "Laboratorio de Fotografía"
+                    "name": "Laboratorio de Fotografía",
+                    "terms": "<translate with synonyms or related terms for 'Photographic Laboratory', separated by commas>"
                 },
                 "craft/plasterer": {
-                    "name": "Xesero"
+                    "name": "Xesero",
+                    "terms": "<translate with synonyms or related terms for 'Plasterer', separated by commas>"
                 },
                 "craft/plumber": {
-                    "name": "Fontaneiro"
+                    "name": "Fontaneiro",
+                    "terms": "<translate with synonyms or related terms for 'Plumber', separated by commas>"
                 },
                 "craft/pottery": {
-                    "name": "Cerámica"
+                    "name": "Cerámica",
+                    "terms": "<translate with synonyms or related terms for 'Pottery', separated by commas>"
                 },
                 "craft/rigger": {
-                    "name": "Aparellador"
+                    "name": "Aparellador",
+                    "terms": "<translate with synonyms or related terms for 'Rigger', separated by commas>"
                 },
                 "craft/roofer": {
-                    "name": "Tellador"
+                    "name": "Tellador",
+                    "terms": "<translate with synonyms or related terms for 'Roofer', separated by commas>"
                 },
                 "craft/saddler": {
-                    "name": "Seleiro"
+                    "name": "Seleiro",
+                    "terms": "<translate with synonyms or related terms for 'Saddler', separated by commas>"
                 },
                 "craft/sailmaker": {
-                    "name": "Fabricante de Velas Mariñas"
+                    "name": "Fabricante de Velas Mariñas",
+                    "terms": "<translate with synonyms or related terms for 'Sailmaker', separated by commas>"
                 },
                 "craft/sawmill": {
-                    "name": "Serraría"
+                    "name": "Serraría",
+                    "terms": "<translate with synonyms or related terms for 'Sawmill', separated by commas>"
                 },
                 "craft/scaffolder": {
-                    "name": "Scaffolder"
+                    "name": "Scaffolder",
+                    "terms": "<translate with synonyms or related terms for 'Scaffolder', separated by commas>"
                 },
                 "craft/sculpter": {
-                    "name": "Escultor"
+                    "name": "Escultor",
+                    "terms": "<translate with synonyms or related terms for 'Sculpter', separated by commas>"
                 },
                 "craft/shoemaker": {
-                    "name": "Zapateiro"
+                    "name": "Zapateiro",
+                    "terms": "<translate with synonyms or related terms for 'Shoemaker', separated by commas>"
                 },
                 "craft/stonemason": {
-                    "name": "Albanel"
+                    "name": "Albanel",
+                    "terms": "<translate with synonyms or related terms for 'Stonemason', separated by commas>"
                 },
                 "craft/sweep": {
-                    "name": "Limpa Chemineas"
+                    "name": "Limpa Chemineas",
+                    "terms": "<translate with synonyms or related terms for 'Chimney Sweep', separated by commas>"
                 },
                 "craft/tailor": {
                     "name": "Xastre"
                 },
                 "craft/tiler": {
-                    "name": "Tellador"
+                    "name": "Tellador",
+                    "terms": "<translate with synonyms or related terms for 'Tiler', separated by commas>"
                 },
                 "craft/tinsmith": {
-                    "name": "Follalateiro"
+                    "name": "Follalateiro",
+                    "terms": "<translate with synonyms or related terms for 'Tinsmith', separated by commas>"
                 },
                 "craft/upholsterer": {
-                    "name": "Tapiceiro"
+                    "name": "Tapiceiro",
+                    "terms": "<translate with synonyms or related terms for 'Upholsterer', separated by commas>"
                 },
                 "craft/watchmaker": {
-                    "name": "Reloxeiro"
+                    "name": "Reloxeiro",
+                    "terms": "<translate with synonyms or related terms for 'Watchmaker', separated by commas>"
                 },
                 "craft/window_construction": {
-                    "name": "Fabricación de Fiestras"
+                    "name": "Fabricación de Fiestras",
+                    "terms": "<translate with synonyms or related terms for 'Window Construction', separated by commas>"
                 },
                 "craft/winery": {
-                    "name": "Lagar"
+                    "name": "Lagar",
+                    "terms": "<translate with synonyms or related terms for 'Winery', separated by commas>"
                 },
                 "embankment": {
-                    "name": "Terraplén"
+                    "name": "Terraplén",
+                    "terms": "<translate with synonyms or related terms for 'Embankment', separated by commas>"
                 },
                 "emergency/ambulance_station": {
-                    "name": "Estación de Ambulancias"
+                    "name": "Estación de Ambulancias",
+                    "terms": "<translate with synonyms or related terms for 'Ambulance Station', separated by commas>"
                 },
                 "emergency/defibrillator": {
-                    "name": "Desfibrilador"
+                    "name": "Desfibrilador",
+                    "terms": "<translate with synonyms or related terms for 'Defibrillator', separated by commas>"
                 },
                 "emergency/designated": {
                     "name": "Acceso de emerxencia designado"
@@ -2988,7 +3237,8 @@
                     "name": "Acceso de Emerxencia Designado"
                 },
                 "emergency/fire_hydrant": {
-                    "name": "Boca de incendio"
+                    "name": "Boca de incendio",
+                    "terms": "<translate with synonyms or related terms for 'Fire Hydrant', separated by commas>"
                 },
                 "emergency/no": {
                     "name": "Sen Acceso de Emerxencia"
@@ -2997,7 +3247,8 @@
                     "name": "Acceso de Emerxencia Oficial"
                 },
                 "emergency/phone": {
-                    "name": "Teléfono de emerxencia"
+                    "name": "Teléfono de emerxencia",
+                    "terms": "<translate with synonyms or related terms for 'Emergency Phone', separated by commas>"
                 },
                 "emergency/private": {
                     "name": "Acceso de Emerxencia Privado"
@@ -3006,637 +3257,845 @@
                     "name": "Acceso de Emerxencia Si"
                 },
                 "entrance": {
-                    "name": "Entrada/Saída"
+                    "name": "Entrada/Saída",
+                    "terms": "<translate with synonyms or related terms for 'Entrance/Exit', separated by commas>"
                 },
                 "footway/crossing": {
-                    "name": "Cruce de Estradas"
+                    "name": "Cruce de Estradas",
+                    "terms": "<translate with synonyms or related terms for 'Street Crossing', separated by commas>"
                 },
                 "footway/crosswalk": {
-                    "name": "Paso de Peóns"
+                    "name": "Paso de Peóns",
+                    "terms": "<translate with synonyms or related terms for 'Pedestrian Crosswalk', separated by commas>"
                 },
                 "footway/sidewalk": {
-                    "name": "Beirarrúa"
+                    "name": "Beirarrúa",
+                    "terms": "<translate with synonyms or related terms for 'Sidewalk', separated by commas>"
                 },
                 "ford": {
-                    "name": "Vao"
+                    "name": "Vao",
+                    "terms": "<translate with synonyms or related terms for 'Ford', separated by commas>"
                 },
                 "golf/bunker": {
-                    "name": "Trampa de Area"
+                    "name": "Trampa de Area",
+                    "terms": "<translate with synonyms or related terms for 'Sand Trap', separated by commas>"
                 },
                 "golf/fairway": {
-                    "name": "Camiño Acceso"
+                    "name": "Camiño Acceso",
+                    "terms": "<translate with synonyms or related terms for 'Fairway', separated by commas>"
                 },
                 "golf/green": {
-                    "name": "Putting Green"
+                    "name": "Putting Green",
+                    "terms": "<translate with synonyms or related terms for 'Putting Green', separated by commas>"
                 },
                 "golf/hole": {
-                    "name": "Burato de Golf"
+                    "name": "Burato de Golf",
+                    "terms": "<translate with synonyms or related terms for 'Golf Hole', separated by commas>"
                 },
                 "golf/lateral_water_hazard_area": {
-                    "name": "Risco de Auga Lateral"
+                    "name": "Risco de Auga Lateral",
+                    "terms": "<translate with synonyms or related terms for 'Lateral Water Hazard', separated by commas>"
                 },
                 "golf/lateral_water_hazard_line": {
-                    "name": "Risco de Auga Lateral"
+                    "name": "Risco de Auga Lateral",
+                    "terms": "<translate with synonyms or related terms for 'Lateral Water Hazard', separated by commas>"
                 },
                 "golf/rough": {
-                    "name": "Duro"
+                    "name": "Duro",
+                    "terms": "<translate with synonyms or related terms for 'Rough', separated by commas>"
                 },
                 "golf/tee": {
-                    "name": "Caixa de Te"
+                    "name": "Caixa de Te",
+                    "terms": "<translate with synonyms or related terms for 'Tee Box', separated by commas>"
                 },
                 "golf/water_hazard_area": {
-                    "name": "Obstáculo de Auga"
+                    "name": "Obstáculo de Auga",
+                    "terms": "<translate with synonyms or related terms for 'Water Hazard', separated by commas>"
                 },
                 "golf/water_hazard_line": {
-                    "name": "Obstáculo de Auga"
+                    "name": "Obstáculo de Auga",
+                    "terms": "<translate with synonyms or related terms for 'Water Hazard', separated by commas>"
                 },
                 "healthcare/blood_donation": {
-                    "name": "Doación de Sangue"
+                    "name": "Doación de Sangue",
+                    "terms": "<translate with synonyms or related terms for 'Blood Donor Center', separated by commas>"
                 },
                 "highway": {
                     "name": "Estrada"
                 },
                 "highway/bridleway": {
-                    "name": "Camiño de ferradura"
+                    "name": "Camiño de ferradura",
+                    "terms": "<translate with synonyms or related terms for 'Bridle Path', separated by commas>"
                 },
                 "highway/bus_stop": {
-                    "name": "Parada de Autobús"
+                    "name": "Parada de Autobús",
+                    "terms": "<translate with synonyms or related terms for 'Bus Stop', separated by commas>"
                 },
                 "highway/corridor": {
-                    "name": "Corredor Interior"
+                    "name": "Corredor Interior",
+                    "terms": "<translate with synonyms or related terms for 'Indoor Corridor', separated by commas>"
                 },
                 "highway/crossing": {
                     "name": "Cruce",
                     "terms": "paso peonil, paso peatonal, paso de cebra"
                 },
                 "highway/crosswalk": {
-                    "name": "Cruce Peonil"
+                    "name": "Cruce Peonil",
+                    "terms": "<translate with synonyms or related terms for 'Pedestrian Crosswalk', separated by commas>"
                 },
                 "highway/cycleway": {
-                    "name": "Senda Ciclista"
+                    "name": "Senda Ciclista",
+                    "terms": "<translate with synonyms or related terms for 'Cycle Path', separated by commas>"
                 },
                 "highway/elevator": {
-                    "name": "Montacargas"
+                    "name": "Montacargas",
+                    "terms": "<translate with synonyms or related terms for 'Elevator', separated by commas>"
                 },
                 "highway/footway": {
-                    "name": "Senda Peonil"
+                    "name": "Senda Peonil",
+                    "terms": "<translate with synonyms or related terms for 'Foot Path', separated by commas>"
                 },
                 "highway/give_way": {
-                    "name": "Ceda o Paso"
+                    "name": "Ceda o Paso",
+                    "terms": "<translate with synonyms or related terms for 'Yield Sign', separated by commas>"
                 },
                 "highway/living_street": {
-                    "name": "Rúa Residencial"
+                    "name": "Rúa Residencial",
+                    "terms": "<translate with synonyms or related terms for 'Living Street', separated by commas>"
                 },
                 "highway/mini_roundabout": {
-                    "name": "Mini Rotonda"
+                    "name": "Mini Rotonda",
+                    "terms": "<translate with synonyms or related terms for 'Mini-Roundabout', separated by commas>"
                 },
                 "highway/motorway": {
-                    "name": "Autovía"
+                    "name": "Autovía",
+                    "terms": "<translate with synonyms or related terms for 'Motorway', separated by commas>"
                 },
                 "highway/motorway_junction": {
-                    "name": "Saída/saída da autoestrada"
+                    "name": "Saída/saída da autoestrada",
+                    "terms": "<translate with synonyms or related terms for 'Motorway Junction / Exit', separated by commas>"
                 },
                 "highway/motorway_link": {
                     "name": "Enlace de autovía",
                     "terms": "autovía, autopista, enlace, entrada, saída, acceso"
                 },
                 "highway/path": {
-                    "name": "Camiño"
+                    "name": "Camiño",
+                    "terms": "<translate with synonyms or related terms for 'Path', separated by commas>"
                 },
                 "highway/pedestrian": {
-                    "name": "Rúa Peonil"
+                    "name": "Rúa Peonil",
+                    "terms": "<translate with synonyms or related terms for 'Pedestrian Street', separated by commas>"
                 },
                 "highway/primary": {
-                    "name": "Estrada Primaria"
+                    "name": "Estrada Primaria",
+                    "terms": "<translate with synonyms or related terms for 'Primary Road', separated by commas>"
                 },
                 "highway/primary_link": {
-                    "name": "Enlace a estrada primaria"
+                    "name": "Enlace a estrada primaria",
+                    "terms": "<translate with synonyms or related terms for 'Primary Link', separated by commas>"
                 },
                 "highway/raceway": {
-                    "name": "Pista de carreiras (Motorsport)"
+                    "name": "Pista de carreiras (Motorsport)",
+                    "terms": "<translate with synonyms or related terms for 'Racetrack (Motorsport)', separated by commas>"
                 },
                 "highway/residential": {
-                    "name": "Rúa urbana"
+                    "name": "Rúa urbana",
+                    "terms": "<translate with synonyms or related terms for 'Residential Road', separated by commas>"
                 },
                 "highway/rest_area": {
-                    "name": "Área de Descanso"
+                    "name": "Área de Descanso",
+                    "terms": "<translate with synonyms or related terms for 'Rest Area', separated by commas>"
                 },
                 "highway/road": {
-                    "name": "Vía de categoría descoñecida"
+                    "name": "Vía de categoría descoñecida",
+                    "terms": "<translate with synonyms or related terms for 'Unknown Road', separated by commas>"
                 },
                 "highway/secondary": {
-                    "name": "Estrada Secundaria"
+                    "name": "Estrada Secundaria",
+                    "terms": "<translate with synonyms or related terms for 'Secondary Road', separated by commas>"
                 },
                 "highway/secondary_link": {
-                    "name": "Ligazón a estrada secundaria"
+                    "name": "Ligazón a estrada secundaria",
+                    "terms": "<translate with synonyms or related terms for 'Secondary Link', separated by commas>"
                 },
                 "highway/service": {
-                    "name": "Vía de Servizo"
+                    "name": "Vía de Servizo",
+                    "terms": "<translate with synonyms or related terms for 'Service Road', separated by commas>"
                 },
                 "highway/service/alley": {
-                    "name": "Calexón"
+                    "name": "Calexón",
+                    "terms": "<translate with synonyms or related terms for 'Alley', separated by commas>"
                 },
                 "highway/service/drive-through": {
-                    "name": "Auto-Servizo"
+                    "name": "Auto-Servizo",
+                    "terms": "<translate with synonyms or related terms for 'Drive-Through', separated by commas>"
                 },
                 "highway/service/driveway": {
-                    "name": "Entrada de Garaxe"
+                    "name": "Entrada de Garaxe",
+                    "terms": "<translate with synonyms or related terms for 'Driveway', separated by commas>"
                 },
                 "highway/service/emergency_access": {
-                    "name": "Acceso de Emerxencia"
+                    "name": "Acceso de Emerxencia",
+                    "terms": "<translate with synonyms or related terms for 'Emergency Access', separated by commas>"
                 },
                 "highway/service/parking_aisle": {
-                    "name": "Pasillo de Aparcamento"
+                    "name": "Pasillo de Aparcamento",
+                    "terms": "<translate with synonyms or related terms for 'Parking Aisle', separated by commas>"
                 },
                 "highway/services": {
-                    "name": "Área de Servizo"
+                    "name": "Área de Servizo",
+                    "terms": "<translate with synonyms or related terms for 'Service Area', separated by commas>"
                 },
                 "highway/speed_camera": {
-                    "name": "Rádar Velocidade"
+                    "name": "Rádar Velocidade",
+                    "terms": "<translate with synonyms or related terms for 'Speed Camera', separated by commas>"
                 },
                 "highway/steps": {
-                    "name": "Escaleiras"
+                    "name": "Escaleiras",
+                    "terms": "<translate with synonyms or related terms for 'Steps', separated by commas>"
                 },
                 "highway/stop": {
-                    "name": "Sinal de Stop"
+                    "name": "Sinal de Stop",
+                    "terms": "<translate with synonyms or related terms for 'Stop Sign', separated by commas>"
                 },
                 "highway/street_lamp": {
-                    "name": "Farola"
+                    "name": "Farola",
+                    "terms": "<translate with synonyms or related terms for 'Street Lamp', separated by commas>"
                 },
                 "highway/tertiary": {
-                    "name": "Estrada terciaria"
+                    "name": "Estrada terciaria",
+                    "terms": "<translate with synonyms or related terms for 'Tertiary Road', separated by commas>"
                 },
                 "highway/tertiary_link": {
-                    "name": "Enlace a estrada terciaria"
+                    "name": "Enlace a estrada terciaria",
+                    "terms": "<translate with synonyms or related terms for 'Tertiary Link', separated by commas>"
                 },
                 "highway/track": {
-                    "name": "Pista Sen Mantemento"
+                    "name": "Pista Sen Mantemento",
+                    "terms": "<translate with synonyms or related terms for 'Unmaintained Track Road', separated by commas>"
                 },
                 "highway/traffic_mirror": {
-                    "name": "Espello de tráfico"
+                    "name": "Espello de tráfico",
+                    "terms": "<translate with synonyms or related terms for 'Traffic Mirror', separated by commas>"
                 },
                 "highway/traffic_signals": {
-                    "name": "Semáforo"
+                    "name": "Semáforo",
+                    "terms": "<translate with synonyms or related terms for 'Traffic Signals', separated by commas>"
                 },
                 "highway/trunk": {
-                    "name": "Estrada troncal"
+                    "name": "Estrada troncal",
+                    "terms": "<translate with synonyms or related terms for 'Trunk Road', separated by commas>"
                 },
                 "highway/trunk_link": {
-                    "name": "Ligazón a estrada troncal"
+                    "name": "Ligazón a estrada troncal",
+                    "terms": "<translate with synonyms or related terms for 'Trunk Link', separated by commas>"
                 },
                 "highway/turning_circle": {
-                    "name": "Círculo de xiro"
+                    "name": "Círculo de xiro",
+                    "terms": "<translate with synonyms or related terms for 'Turning Circle', separated by commas>"
                 },
                 "highway/turning_loop": {
-                    "name": "Rotonda (Illa)"
+                    "name": "Rotonda (Illa)",
+                    "terms": "<translate with synonyms or related terms for 'Turning Loop (Island)', separated by commas>"
                 },
                 "highway/unclassified": {
-                    "name": "Estrada Menor/Sen Clasificar"
+                    "name": "Estrada Menor/Sen Clasificar",
+                    "terms": "<translate with synonyms or related terms for 'Minor/Unclassified Road', separated by commas>"
                 },
                 "historic": {
-                    "name": "Lugar histórico"
+                    "name": "Lugar histórico",
+                    "terms": "<translate with synonyms or related terms for 'Historic Site', separated by commas>"
                 },
                 "historic/archaeological_site": {
-                    "name": "Sitio arqueolóxico"
+                    "name": "Sitio arqueolóxico",
+                    "terms": "<translate with synonyms or related terms for 'Archaeological Site', separated by commas>"
                 },
                 "historic/boundary_stone": {
                     "name": "Marco",
                     "terms": "marco, fito, mollón, mouteira, linde, pedra"
                 },
                 "historic/castle": {
-                    "name": "Castelo"
+                    "name": "Castelo",
+                    "terms": "<translate with synonyms or related terms for 'Castle', separated by commas>"
                 },
                 "historic/memorial": {
-                    "name": "Monumento conmemorativo"
+                    "name": "Monumento conmemorativo",
+                    "terms": "<translate with synonyms or related terms for 'Memorial', separated by commas>"
                 },
                 "historic/monument": {
-                    "name": "Monumento"
+                    "name": "Monumento",
+                    "terms": "<translate with synonyms or related terms for 'Monument', separated by commas>"
                 },
                 "historic/ruins": {
-                    "name": "Ruinas"
+                    "name": "Ruinas",
+                    "terms": "<translate with synonyms or related terms for 'Ruins', separated by commas>"
                 },
                 "historic/tomb": {
-                    "name": "Tumba"
+                    "name": "Tumba",
+                    "terms": "<translate with synonyms or related terms for 'Tomb', separated by commas>"
                 },
                 "historic/wayside_cross": {
-                    "name": "Cruceiro"
+                    "name": "Cruceiro",
+                    "terms": "<translate with synonyms or related terms for 'Wayside Cross', separated by commas>"
                 },
                 "historic/wayside_shrine": {
-                    "name": "Peto de ánimas"
+                    "name": "Peto de ánimas",
+                    "terms": "<translate with synonyms or related terms for 'Wayside Shrine', separated by commas>"
                 },
                 "junction": {
-                    "name": "Incorporación"
+                    "name": "Incorporación",
+                    "terms": "<translate with synonyms or related terms for 'Junction', separated by commas>"
                 },
                 "landuse": {
-                    "name": "Uso da Terra"
+                    "name": "Uso da Terra",
+                    "terms": "<translate with synonyms or related terms for 'Land Use', separated by commas>"
                 },
                 "landuse/allotments": {
-                    "name": "Xardín Comunitario"
+                    "name": "Xardín Comunitario",
+                    "terms": "<translate with synonyms or related terms for 'Community Garden', separated by commas>"
                 },
                 "landuse/aquaculture": {
-                    "name": "Acuacultura"
+                    "name": "Acuacultura",
+                    "terms": "<translate with synonyms or related terms for 'Aquaculture', separated by commas>"
                 },
                 "landuse/basin": {
-                    "name": "Cunca"
+                    "name": "Cunca",
+                    "terms": "<translate with synonyms or related terms for 'Basin', separated by commas>"
                 },
                 "landuse/cemetery": {
-                    "name": "Cemiterio"
+                    "name": "Cemiterio",
+                    "terms": "<translate with synonyms or related terms for 'Cemetery', separated by commas>"
                 },
                 "landuse/churchyard": {
-                    "name": "Adro"
+                    "name": "Adro",
+                    "terms": "<translate with synonyms or related terms for 'Churchyard', separated by commas>"
                 },
                 "landuse/commercial": {
-                    "name": "Área Comercial"
+                    "name": "Área Comercial",
+                    "terms": "<translate with synonyms or related terms for 'Commercial Area', separated by commas>"
                 },
                 "landuse/construction": {
-                    "name": "Construción"
+                    "name": "Construción",
+                    "terms": "<translate with synonyms or related terms for 'Construction', separated by commas>"
                 },
                 "landuse/farm": {
                     "name": "Terra de Cultivo"
                 },
                 "landuse/farmland": {
-                    "name": "Terra de Cultivo"
+                    "name": "Terra de Cultivo",
+                    "terms": "<translate with synonyms or related terms for 'Farmland', separated by commas>"
                 },
                 "landuse/farmyard": {
-                    "name": "Granxa"
+                    "name": "Granxa",
+                    "terms": "<translate with synonyms or related terms for 'Farmyard', separated by commas>"
                 },
                 "landuse/forest": {
-                    "name": "Forestal"
+                    "name": "Forestal",
+                    "terms": "<translate with synonyms or related terms for 'Forest', separated by commas>"
                 },
                 "landuse/garages": {
-                    "name": "Garaxes"
+                    "name": "Garaxes",
+                    "terms": "<translate with synonyms or related terms for 'Garages', separated by commas>"
                 },
                 "landuse/grass": {
-                    "name": "Herba"
+                    "name": "Herba",
+                    "terms": "<translate with synonyms or related terms for 'Grass', separated by commas>"
                 },
                 "landuse/harbour": {
-                    "name": "Peirao"
+                    "name": "Peirao",
+                    "terms": "<translate with synonyms or related terms for 'Harbor', separated by commas>"
                 },
                 "landuse/industrial": {
-                    "name": "Industrial Area"
+                    "name": "Industrial Area",
+                    "terms": "<translate with synonyms or related terms for 'Industrial Area', separated by commas>"
                 },
                 "landuse/landfill": {
-                    "name": "Terraplén"
+                    "name": "Terraplén",
+                    "terms": "<translate with synonyms or related terms for 'Landfill', separated by commas>"
                 },
                 "landuse/meadow": {
-                    "name": "Prado"
+                    "name": "Prado",
+                    "terms": "<translate with synonyms or related terms for 'Meadow', separated by commas>"
                 },
                 "landuse/military": {
-                    "name": "Zona Militar"
+                    "name": "Zona Militar",
+                    "terms": "<translate with synonyms or related terms for 'Military Area', separated by commas>"
                 },
                 "landuse/military/airfield": {
-                    "name": "Aeródromo Militar"
+                    "name": "Aeródromo Militar",
+                    "terms": "<translate with synonyms or related terms for 'Military Airfield', separated by commas>"
                 },
                 "landuse/military/barracks": {
-                    "name": "Barracóns"
+                    "name": "Barracóns",
+                    "terms": "<translate with synonyms or related terms for 'Barracks', separated by commas>"
                 },
                 "landuse/military/bunker": {
-                    "name": "Bunker Militar"
+                    "name": "Bunker Militar",
+                    "terms": "<translate with synonyms or related terms for 'Military Bunker', separated by commas>"
                 },
                 "landuse/military/checkpoint": {
-                    "name": "Checkpoint"
+                    "name": "Checkpoint",
+                    "terms": "<translate with synonyms or related terms for 'Checkpoint', separated by commas>"
                 },
                 "landuse/military/danger_area": {
-                    "name": "Área Perigosa"
+                    "name": "Área Perigosa",
+                    "terms": "<translate with synonyms or related terms for 'Danger Area', separated by commas>"
                 },
                 "landuse/military/naval_base": {
-                    "name": "Base Naval"
+                    "name": "Base Naval",
+                    "terms": "<translate with synonyms or related terms for 'Naval Base', separated by commas>"
                 },
                 "landuse/military/nuclear_explosion_site": {
-                    "name": "Explosión Nuclear Lugar"
+                    "name": "Explosión Nuclear Lugar",
+                    "terms": "<translate with synonyms or related terms for 'Nuclear Explosion Site', separated by commas>"
                 },
                 "landuse/military/obstacle_course": {
-                    "name": "Pista de Obstáculos"
+                    "name": "Pista de Obstáculos",
+                    "terms": "<translate with synonyms or related terms for 'Obstacle Course', separated by commas>"
                 },
                 "landuse/military/office": {
-                    "name": "Militar Oficina"
+                    "name": "Militar Oficina",
+                    "terms": "<translate with synonyms or related terms for 'Military Office', separated by commas>"
                 },
                 "landuse/military/range": {
-                    "name": "Franxa Militar"
+                    "name": "Franxa Militar",
+                    "terms": "<translate with synonyms or related terms for 'Military Range', separated by commas>"
                 },
                 "landuse/military/training_area": {
-                    "name": "Área de Entreno"
+                    "name": "Área de Entreno",
+                    "terms": "<translate with synonyms or related terms for 'Training Area', separated by commas>"
                 },
                 "landuse/orchard": {
-                    "name": "Área de froitais"
+                    "name": "Área de froitais",
+                    "terms": "<translate with synonyms or related terms for 'Orchard', separated by commas>"
                 },
                 "landuse/plant_nursery": {
-                    "name": "Viveiro de Plantas"
+                    "name": "Viveiro de Plantas",
+                    "terms": "<translate with synonyms or related terms for 'Plant Nursery', separated by commas>"
                 },
                 "landuse/quarry": {
-                    "name": "Canteira"
+                    "name": "Canteira",
+                    "terms": "<translate with synonyms or related terms for 'Quarry', separated by commas>"
                 },
                 "landuse/railway": {
-                    "name": "Corredor Ferroviario"
+                    "name": "Corredor Ferroviario",
+                    "terms": "<translate with synonyms or related terms for 'Railway Corridor', separated by commas>"
                 },
                 "landuse/recreation_ground": {
-                    "name": "Campo de Diversión"
+                    "name": "Campo de Diversión",
+                    "terms": "<translate with synonyms or related terms for 'Recreation Ground', separated by commas>"
                 },
                 "landuse/residential": {
-                    "name": "Área Residencial"
+                    "name": "Área Residencial",
+                    "terms": "<translate with synonyms or related terms for 'Residential Area', separated by commas>"
                 },
                 "landuse/retail": {
-                    "name": "Venda Minorista Área"
+                    "name": "Venda Minorista Área",
+                    "terms": "<translate with synonyms or related terms for 'Retail Area', separated by commas>"
                 },
                 "landuse/vineyard": {
-                    "name": "Viña"
+                    "name": "Viña",
+                    "terms": "<translate with synonyms or related terms for 'Vineyard', separated by commas>"
                 },
                 "leisure": {
-                    "name": "Ocio"
+                    "name": "Ocio",
+                    "terms": "<translate with synonyms or related terms for 'Leisure', separated by commas>"
                 },
                 "leisure/adult_gaming_centre": {
-                    "name": "Centro Recreativo para Adultos"
+                    "name": "Centro Recreativo para Adultos",
+                    "terms": "<translate with synonyms or related terms for 'Adult Gaming Center', separated by commas>"
                 },
                 "leisure/bird_hide": {
-                    "name": "Ocultado de Aves"
+                    "name": "Ocultado de Aves",
+                    "terms": "<translate with synonyms or related terms for 'Bird Hide', separated by commas>"
                 },
                 "leisure/bowling_alley": {
-                    "name": "Birlos"
+                    "name": "Birlos",
+                    "terms": "<translate with synonyms or related terms for 'Bowling Alley', separated by commas>"
                 },
                 "leisure/common": {
-                    "name": "Común"
+                    "name": "Común",
+                    "terms": "<translate with synonyms or related terms for 'Common', separated by commas>"
                 },
                 "leisure/dance": {
-                    "name": "Sala de Baile"
+                    "name": "Sala de Baile",
+                    "terms": "<translate with synonyms or related terms for 'Dance Hall', separated by commas>"
                 },
                 "leisure/dog_park": {
-                    "name": "Parque Canino"
+                    "name": "Parque Canino",
+                    "terms": "<translate with synonyms or related terms for 'Dog Park', separated by commas>"
                 },
                 "leisure/firepit": {
-                    "name": "Fogueira"
+                    "name": "Fogueira",
+                    "terms": "<translate with synonyms or related terms for 'Firepit', separated by commas>"
                 },
                 "leisure/fitness_centre": {
-                    "name": "Ximnasio/Fitness Centro"
+                    "name": "Ximnasio/Fitness Centro",
+                    "terms": "<translate with synonyms or related terms for 'Gym / Fitness Center', separated by commas>"
                 },
                 "leisure/fitness_centre/yoga": {
-                    "name": "Estudio de Yoga"
+                    "name": "Estudio de Yoga",
+                    "terms": "<translate with synonyms or related terms for 'Yoga Studio', separated by commas>"
                 },
                 "leisure/fitness_station": {
-                    "name": "Estación de ximnasia ao aire libre"
+                    "name": "Estación de ximnasia ao aire libre",
+                    "terms": "<translate with synonyms or related terms for 'Outdoor Fitness Station', separated by commas>"
                 },
                 "leisure/garden": {
-                    "name": "Xardín"
+                    "name": "Xardín",
+                    "terms": "<translate with synonyms or related terms for 'Garden', separated by commas>"
                 },
                 "leisure/golf_course": {
-                    "name": "Campo de Golf"
+                    "name": "Campo de Golf",
+                    "terms": "<translate with synonyms or related terms for 'Golf Course', separated by commas>"
                 },
                 "leisure/horse_riding": {
-                    "name": "Centro de Equitación"
+                    "name": "Centro de Equitación",
+                    "terms": "<translate with synonyms or related terms for 'Horseback Riding Facility', separated by commas>"
                 },
                 "leisure/ice_rink": {
-                    "name": "Pista de Xeo"
+                    "name": "Pista de Xeo",
+                    "terms": "<translate with synonyms or related terms for 'Ice Rink', separated by commas>"
                 },
                 "leisure/marina": {
-                    "name": "Marina"
+                    "name": "Marina",
+                    "terms": "<translate with synonyms or related terms for 'Marina', separated by commas>"
                 },
                 "leisure/miniature_golf": {
-                    "name": "Mini Golf"
+                    "name": "Mini Golf",
+                    "terms": "<translate with synonyms or related terms for 'Miniature Golf', separated by commas>"
                 },
                 "leisure/nature_reserve": {
-                    "name": "Reserva Natural"
+                    "name": "Reserva Natural",
+                    "terms": "<translate with synonyms or related terms for 'Nature Reserve', separated by commas>"
                 },
                 "leisure/park": {
                     "name": "Parque",
                     "terms": "parque, zona verde, xardín, alameda"
                 },
                 "leisure/picnic_table": {
-                    "name": "Mesa de Picnic"
+                    "name": "Mesa de Picnic",
+                    "terms": "<translate with synonyms or related terms for 'Picnic Table', separated by commas>"
                 },
                 "leisure/pitch": {
-                    "name": "Campo deportivo"
+                    "name": "Campo deportivo",
+                    "terms": "<translate with synonyms or related terms for 'Sport Pitch', separated by commas>"
                 },
                 "leisure/pitch/american_football": {
-                    "name": "Campo de fútbol americano"
+                    "name": "Campo de fútbol americano",
+                    "terms": "<translate with synonyms or related terms for 'American Football Field', separated by commas>"
                 },
                 "leisure/pitch/baseball": {
-                    "name": "Diamante de béisbol"
+                    "name": "Diamante de béisbol",
+                    "terms": "<translate with synonyms or related terms for 'Baseball Diamond', separated by commas>"
                 },
                 "leisure/pitch/basketball": {
-                    "name": "Cancha de baloncesto"
+                    "name": "Cancha de baloncesto",
+                    "terms": "<translate with synonyms or related terms for 'Basketball Court', separated by commas>"
                 },
                 "leisure/pitch/beachvolleyball": {
-                    "name": "Cancha de Voley Praia"
+                    "name": "Cancha de Voley Praia",
+                    "terms": "<translate with synonyms or related terms for 'Beach Volleyball Court', separated by commas>"
                 },
                 "leisure/pitch/bowls": {
-                    "name": "Bowling Green"
+                    "name": "Bowling Green",
+                    "terms": "<translate with synonyms or related terms for 'Bowling Green', separated by commas>"
                 },
                 "leisure/pitch/cricket": {
-                    "name": "Campo de Cricket"
+                    "name": "Campo de Cricket",
+                    "terms": "<translate with synonyms or related terms for 'Cricket Field', separated by commas>"
                 },
                 "leisure/pitch/equestrian": {
-                    "name": "Equitación Area"
+                    "name": "Equitación Area",
+                    "terms": "<translate with synonyms or related terms for 'Riding Arena', separated by commas>"
                 },
                 "leisure/pitch/rugby_league": {
-                    "name": "Campo Liga de Rugby"
+                    "name": "Campo Liga de Rugby",
+                    "terms": "<translate with synonyms or related terms for 'Rugby League Field', separated by commas>"
                 },
                 "leisure/pitch/rugby_union": {
-                    "name": "Campo Unión de Rugby"
+                    "name": "Campo Unión de Rugby",
+                    "terms": "<translate with synonyms or related terms for 'Rugby Union Field', separated by commas>"
                 },
                 "leisure/pitch/skateboard": {
-                    "name": "Parque de Skate"
+                    "name": "Parque de Skate",
+                    "terms": "<translate with synonyms or related terms for 'Skate Park', separated by commas>"
                 },
                 "leisure/pitch/soccer": {
-                    "name": "Campo de fútbol"
+                    "name": "Campo de fútbol",
+                    "terms": "<translate with synonyms or related terms for 'Soccer Field', separated by commas>"
                 },
                 "leisure/pitch/table_tennis": {
-                    "name": "Mesa de Ping Pong"
+                    "name": "Mesa de Ping Pong",
+                    "terms": "<translate with synonyms or related terms for 'Ping Pong Table', separated by commas>"
                 },
                 "leisure/pitch/tennis": {
-                    "name": "Cancha de tenis"
+                    "name": "Cancha de tenis",
+                    "terms": "<translate with synonyms or related terms for 'Tennis Court', separated by commas>"
                 },
                 "leisure/pitch/volleyball": {
-                    "name": "Cancha de voleibol"
+                    "name": "Cancha de voleibol",
+                    "terms": "<translate with synonyms or related terms for 'Volleyball Court', separated by commas>"
                 },
                 "leisure/playground": {
-                    "name": "Área de recreo"
+                    "name": "Área de recreo",
+                    "terms": "<translate with synonyms or related terms for 'Playground', separated by commas>"
                 },
                 "leisure/resort": {
-                    "name": "Recurso"
+                    "name": "Recurso",
+                    "terms": "<translate with synonyms or related terms for 'Resort', separated by commas>"
                 },
                 "leisure/running_track": {
-                    "name": "Pista de Carreiras (Velocidade)"
+                    "name": "Pista de Carreiras (Velocidade)",
+                    "terms": "<translate with synonyms or related terms for 'Racetrack (Running)', separated by commas>"
                 },
                 "leisure/slipway": {
-                    "name": "Rampla"
+                    "name": "Rampla",
+                    "terms": "<translate with synonyms or related terms for 'Slipway', separated by commas>"
                 },
                 "leisure/sports_centre": {
-                    "name": "Centro Deportivo/Complexo"
+                    "name": "Centro Deportivo/Complexo",
+                    "terms": "<translate with synonyms or related terms for 'Sports Center / Complex', separated by commas>"
                 },
                 "leisure/sports_centre/swimming": {
-                    "name": "Servizo de Piscina"
+                    "name": "Servizo de Piscina",
+                    "terms": "<translate with synonyms or related terms for 'Swimming Pool Facility', separated by commas>"
                 },
                 "leisure/stadium": {
-                    "name": "Estadio"
+                    "name": "Estadio",
+                    "terms": "<translate with synonyms or related terms for 'Stadium', separated by commas>"
                 },
                 "leisure/swimming_pool": {
-                    "name": "Piscina"
+                    "name": "Piscina",
+                    "terms": "<translate with synonyms or related terms for 'Swimming Pool', separated by commas>"
                 },
                 "leisure/track": {
-                    "name": "Pista de competición (non motorizada)"
+                    "name": "Pista de competición (non motorizada)",
+                    "terms": "<translate with synonyms or related terms for 'Racetrack (Non-Motorsport)', separated by commas>"
                 },
                 "leisure/water_park": {
-                    "name": "Parque Acuático"
+                    "name": "Parque Acuático",
+                    "terms": "<translate with synonyms or related terms for 'Water Park', separated by commas>"
                 },
                 "line": {
-                    "name": "Liña"
+                    "name": "Liña",
+                    "terms": "<translate with synonyms or related terms for 'Line', separated by commas>"
                 },
                 "man_made": {
-                    "name": "Estrutura artificial"
+                    "name": "Estrutura artificial",
+                    "terms": "<translate with synonyms or related terms for 'Man Made', separated by commas>"
                 },
                 "man_made/adit": {
-                    "name": "Santuario"
+                    "name": "Santuario",
+                    "terms": "<translate with synonyms or related terms for 'Adit', separated by commas>"
                 },
                 "man_made/breakwater": {
-                    "name": "Rompeondas"
+                    "name": "Rompeondas",
+                    "terms": "<translate with synonyms or related terms for 'Breakwater', separated by commas>"
                 },
                 "man_made/bridge": {
-                    "name": "Ponte"
+                    "name": "Ponte",
+                    "terms": "<translate with synonyms or related terms for 'Bridge', separated by commas>"
                 },
                 "man_made/chimney": {
-                    "name": "Cheminea"
+                    "name": "Cheminea",
+                    "terms": "<translate with synonyms or related terms for 'Chimney', separated by commas>"
                 },
                 "man_made/cutline": {
-                    "name": "Corta lumes"
+                    "name": "Corta lumes",
+                    "terms": "<translate with synonyms or related terms for 'Cut line', separated by commas>"
                 },
                 "man_made/embankment": {
                     "name": "Terraplén"
                 },
                 "man_made/flagpole": {
-                    "name": "Mantro de Bandeira"
+                    "name": "Mantro de Bandeira",
+                    "terms": "<translate with synonyms or related terms for 'Flagpole', separated by commas>"
                 },
                 "man_made/gasometer": {
-                    "name": "Gasómetro"
+                    "name": "Gasómetro",
+                    "terms": "<translate with synonyms or related terms for 'Gasometer', separated by commas>"
                 },
                 "man_made/groyne": {
-                    "name": "Dique"
+                    "name": "Dique",
+                    "terms": "<translate with synonyms or related terms for 'Groyne', separated by commas>"
                 },
                 "man_made/lighthouse": {
-                    "name": "Faro"
+                    "name": "Faro",
+                    "terms": "<translate with synonyms or related terms for 'Lighthouse', separated by commas>"
                 },
                 "man_made/mast": {
-                    "name": "Mastro"
+                    "name": "Mastro",
+                    "terms": "<translate with synonyms or related terms for 'Mast', separated by commas>"
                 },
                 "man_made/observation": {
-                    "name": "Torre de Observación"
+                    "name": "Torre de Observación",
+                    "terms": "<translate with synonyms or related terms for 'Observation Tower', separated by commas>"
                 },
                 "man_made/petroleum_well": {
-                    "name": "Pozo de Petróleo"
+                    "name": "Pozo de Petróleo",
+                    "terms": "<translate with synonyms or related terms for 'Oil Well', separated by commas>"
                 },
                 "man_made/pier": {
-                    "name": "Peirao"
+                    "name": "Peirao",
+                    "terms": "<translate with synonyms or related terms for 'Pier', separated by commas>"
                 },
                 "man_made/pipeline": {
-                    "name": "Tubería"
+                    "name": "Tubería",
+                    "terms": "<translate with synonyms or related terms for 'Pipeline', separated by commas>"
                 },
                 "man_made/pumping_station": {
-                    "name": "Estación de Bombeo"
+                    "name": "Estación de Bombeo",
+                    "terms": "<translate with synonyms or related terms for 'Pumping Station', separated by commas>"
                 },
                 "man_made/silo": {
-                    "name": "Silo"
+                    "name": "Silo",
+                    "terms": "<translate with synonyms or related terms for 'Silo', separated by commas>"
                 },
                 "man_made/storage_tank": {
-                    "name": "Tanque de Almacenamento"
+                    "name": "Tanque de Almacenamento",
+                    "terms": "<translate with synonyms or related terms for 'Storage Tank', separated by commas>"
                 },
                 "man_made/surveillance": {
-                    "name": "Vixilancia"
+                    "name": "Vixilancia",
+                    "terms": "<translate with synonyms or related terms for 'Surveillance', separated by commas>"
                 },
                 "man_made/surveillance_camera": {
-                    "name": "Vídeo Vixilancia"
+                    "name": "Vídeo Vixilancia",
+                    "terms": "<translate with synonyms or related terms for 'Surveillance Camera', separated by commas>"
                 },
                 "man_made/survey_point": {
-                    "name": "Vértice xeodésico"
+                    "name": "Vértice xeodésico",
+                    "terms": "<translate with synonyms or related terms for 'Survey Point', separated by commas>"
                 },
                 "man_made/tower": {
-                    "name": "Torre"
+                    "name": "Torre",
+                    "terms": "<translate with synonyms or related terms for 'Tower', separated by commas>"
                 },
                 "man_made/wastewater_plant": {
-                    "name": "Depuradora de augas"
+                    "name": "Depuradora de augas",
+                    "terms": "<translate with synonyms or related terms for 'Wastewater Plant', separated by commas>"
                 },
                 "man_made/water_tower": {
-                    "name": "Torre de auga"
+                    "name": "Torre de auga",
+                    "terms": "<translate with synonyms or related terms for 'Water Tower', separated by commas>"
                 },
                 "man_made/water_well": {
-                    "name": "Pozo"
+                    "name": "Pozo",
+                    "terms": "<translate with synonyms or related terms for 'Water Well', separated by commas>"
                 },
                 "man_made/water_works": {
-                    "name": "Traballos Acuáticos"
+                    "name": "Traballos Acuáticos",
+                    "terms": "<translate with synonyms or related terms for 'Water Works', separated by commas>"
+                },
+                "man_made/watermill": {
+                    "name": "Muíño de auga",
+                    "terms": "<translate with synonyms or related terms for 'Watermill', separated by commas>"
+                },
+                "man_made/windmill": {
+                    "name": "Muíño de vento",
+                    "terms": "<translate with synonyms or related terms for 'Windmill', separated by commas>"
                 },
                 "man_made/works": {
-                    "name": "Fábrica"
+                    "name": "Fábrica",
+                    "terms": "<translate with synonyms or related terms for 'Factory', separated by commas>"
                 },
                 "manhole": {
-                    "name": "Burato de home"
+                    "name": "Burato de home",
+                    "terms": "<translate with synonyms or related terms for 'Manhole', separated by commas>"
                 },
                 "manhole/drain": {
-                    "name": "Drenaxe da tormenta"
+                    "name": "Drenaxe da tormenta",
+                    "terms": "<translate with synonyms or related terms for 'Storm Drain', separated by commas>"
                 },
                 "natural": {
-                    "name": "Natural"
+                    "name": "Natural",
+                    "terms": "<translate with synonyms or related terms for 'Natural', separated by commas>"
                 },
                 "natural/bare_rock": {
-                    "name": "Rocha Pelada"
+                    "name": "Rocha Pelada",
+                    "terms": "<translate with synonyms or related terms for 'Bare Rock', separated by commas>"
                 },
                 "natural/bay": {
-                    "name": "Baía"
+                    "name": "Baía",
+                    "terms": "<translate with synonyms or related terms for 'Bay', separated by commas>"
                 },
                 "natural/beach": {
-                    "name": "Praia"
+                    "name": "Praia",
+                    "terms": "<translate with synonyms or related terms for 'Beach', separated by commas>"
                 },
                 "natural/cave_entrance": {
-                    "name": "Entrada de Cova"
+                    "name": "Entrada de Cova",
+                    "terms": "<translate with synonyms or related terms for 'Cave Entrance', separated by commas>"
                 },
                 "natural/cliff": {
-                    "name": "Cantil"
+                    "name": "Cantil",
+                    "terms": "<translate with synonyms or related terms for 'Cliff', separated by commas>"
                 },
                 "natural/coastline": {
                     "name": "Liña de costa",
                     "terms": "liña de costa, costa, litoral, ribeira"
                 },
                 "natural/fell": {
-                    "name": "Caeu"
+                    "name": "Caeu",
+                    "terms": "<translate with synonyms or related terms for 'Fell', separated by commas>"
                 },
                 "natural/glacier": {
-                    "name": "Glaciar"
+                    "name": "Glaciar",
+                    "terms": "<translate with synonyms or related terms for 'Glacier', separated by commas>"
                 },
                 "natural/grassland": {
-                    "name": "Pradeira"
+                    "name": "Pradeira",
+                    "terms": "<translate with synonyms or related terms for 'Grassland', separated by commas>"
                 },
                 "natural/heath": {
-                    "name": "Uceira ou breixeira"
+                    "name": "Uceira ou breixeira",
+                    "terms": "<translate with synonyms or related terms for 'Heath', separated by commas>"
                 },
                 "natural/peak": {
                     "name": "Cume",
                     "terms": "pico, cume, montaña, monte, cúspide"
                 },
                 "natural/ridge": {
-                    "name": "Cume"
+                    "name": "Cume",
+                    "terms": "<translate with synonyms or related terms for 'Ridge', separated by commas>"
                 },
                 "natural/saddle": {
-                    "name": "Sillín"
+                    "name": "Sillín",
+                    "terms": "<translate with synonyms or related terms for 'Saddle', separated by commas>"
                 },
                 "natural/sand": {
-                    "name": "Area"
+                    "name": "Area",
+                    "terms": "<translate with synonyms or related terms for 'Sand', separated by commas>"
                 },
                 "natural/scree": {
-                    "name": "Laxas"
+                    "name": "Laxas",
+                    "terms": "<translate with synonyms or related terms for 'Scree', separated by commas>"
                 },
                 "natural/scrub": {
-                    "name": "Matogueira"
+                    "name": "Matogueira",
+                    "terms": "<translate with synonyms or related terms for 'Scrub', separated by commas>"
                 },
                 "natural/spring": {
-                    "name": "Manancial"
+                    "name": "Manancial",
+                    "terms": "<translate with synonyms or related terms for 'Spring', separated by commas>"
                 },
                 "natural/tree": {
-                    "name": "Árbore"
+                    "name": "Árbore",
+                    "terms": "<translate with synonyms or related terms for 'Tree', separated by commas>"
                 },
                 "natural/tree_row": {
-                    "name": "Fila de Árbores"
+                    "name": "Fila de Árbores",
+                    "terms": "<translate with synonyms or related terms for 'Tree row', separated by commas>"
                 },
                 "natural/volcano": {
-                    "name": "Volcán"
+                    "name": "Volcán",
+                    "terms": "<translate with synonyms or related terms for 'Volcano', separated by commas>"
                 },
                 "natural/water": {
-                    "name": "Auga"
+                    "name": "Auga",
+                    "terms": "<translate with synonyms or related terms for 'Water', separated by commas>"
                 },
                 "natural/water/lake": {
                     "name": "Lago",
@@ -3647,821 +4106,1085 @@
                     "terms": "auga, estanque, lagoa, charca"
                 },
                 "natural/water/reservoir": {
-                    "name": "Encoro"
+                    "name": "Encoro",
+                    "terms": "<translate with synonyms or related terms for 'Reservoir', separated by commas>"
                 },
                 "natural/wetland": {
-                    "name": "Pantano"
+                    "name": "Pantano",
+                    "terms": "<translate with synonyms or related terms for 'Wetland', separated by commas>"
                 },
                 "natural/wood": {
-                    "name": "Bosque"
+                    "name": "Bosque",
+                    "terms": "<translate with synonyms or related terms for 'Wood', separated by commas>"
                 },
                 "noexit/yes": {
-                    "name": "Sen Saída"
+                    "name": "Sen Saída",
+                    "terms": "<translate with synonyms or related terms for 'No Exit', separated by commas>"
                 },
                 "office": {
-                    "name": "Oficina"
+                    "name": "Oficina",
+                    "terms": "<translate with synonyms or related terms for 'Office', separated by commas>"
                 },
                 "office/accountant": {
-                    "name": "Contador"
+                    "name": "Contador",
+                    "terms": "<translate with synonyms or related terms for 'Accountant', separated by commas>"
                 },
                 "office/administrative": {
-                    "name": "Oficina Administrativa"
+                    "name": "Oficina Administrativa",
+                    "terms": "<translate with synonyms or related terms for 'Administrative Office', separated by commas>"
                 },
                 "office/architect": {
-                    "name": "Arquitecto"
+                    "name": "Arquitecto",
+                    "terms": "<translate with synonyms or related terms for 'Architect', separated by commas>"
                 },
                 "office/company": {
-                    "name": "Oficina de Empresa"
+                    "name": "Oficina de Empresa",
+                    "terms": "<translate with synonyms or related terms for 'Company Office', separated by commas>"
                 },
                 "office/coworking": {
-                    "name": "Espacio de Cotraballo"
+                    "name": "Espacio de Cotraballo",
+                    "terms": "<translate with synonyms or related terms for 'Coworking Space', separated by commas>"
                 },
                 "office/educational_institution": {
-                    "name": "Institución Educativa"
+                    "name": "Institución Educativa",
+                    "terms": "<translate with synonyms or related terms for 'Educational Institution', separated by commas>"
                 },
                 "office/employment_agency": {
-                    "name": "Axencia de Emprego"
+                    "name": "Axencia de Emprego",
+                    "terms": "<translate with synonyms or related terms for 'Employment Agency', separated by commas>"
                 },
                 "office/estate_agent": {
-                    "name": "Oficina Inmobiliaria"
+                    "name": "Oficina Inmobiliaria",
+                    "terms": "<translate with synonyms or related terms for 'Real Estate Office', separated by commas>"
                 },
                 "office/financial": {
-                    "name": "Oficina Financeira"
+                    "name": "Oficina Financeira",
+                    "terms": "<translate with synonyms or related terms for 'Financial Office', separated by commas>"
                 },
                 "office/government": {
-                    "name": "Gobernamental Oficina"
+                    "name": "Gobernamental Oficina",
+                    "terms": "<translate with synonyms or related terms for 'Government Office', separated by commas>"
                 },
                 "office/government/register_office": {
-                    "name": "Rexistro Oficina"
+                    "name": "Rexistro Oficina",
+                    "terms": "<translate with synonyms or related terms for 'Register Office', separated by commas>"
                 },
                 "office/insurance": {
-                    "name": "Oficina de Seguros"
+                    "name": "Oficina de Seguros",
+                    "terms": "<translate with synonyms or related terms for 'Insurance Office', separated by commas>"
                 },
                 "office/it": {
-                    "name": "IT Oficina"
+                    "name": "IT Oficina",
+                    "terms": "<translate with synonyms or related terms for 'IT Office', separated by commas>"
                 },
                 "office/lawyer": {
-                    "name": "Bufete"
+                    "name": "Bufete",
+                    "terms": "<translate with synonyms or related terms for 'Law Office', separated by commas>"
                 },
                 "office/lawyer/notary": {
-                    "name": "Notaría"
+                    "name": "Notaría",
+                    "terms": "<translate with synonyms or related terms for 'Notary Office', separated by commas>"
                 },
                 "office/newspaper": {
-                    "name": "Xornal"
+                    "name": "Xornal",
+                    "terms": "<translate with synonyms or related terms for 'Newspaper', separated by commas>"
                 },
                 "office/ngo": {
-                    "name": "Oficina ONG"
+                    "name": "Oficina ONG",
+                    "terms": "<translate with synonyms or related terms for 'NGO Office', separated by commas>"
                 },
                 "office/physician": {
-                    "name": "Médico"
+                    "name": "Médico",
+                    "terms": "<translate with synonyms or related terms for 'Physician', separated by commas>"
                 },
                 "office/political_party": {
-                    "name": "Partido Político"
+                    "name": "Partido Político",
+                    "terms": "<translate with synonyms or related terms for 'Political Party', separated by commas>"
                 },
                 "office/research": {
-                    "name": "Investigación Oficina"
+                    "name": "Investigación Oficina",
+                    "terms": "<translate with synonyms or related terms for 'Research Office', separated by commas>"
                 },
                 "office/telecommunication": {
-                    "name": "Oficina de Telecomunicacións"
+                    "name": "Oficina de Telecomunicacións",
+                    "terms": "<translate with synonyms or related terms for 'Telecom Office', separated by commas>"
                 },
                 "office/therapist": {
-                    "name": "Terapeuta"
+                    "name": "Terapeuta",
+                    "terms": "<translate with synonyms or related terms for 'Therapist', separated by commas>"
                 },
                 "office/travel_agent": {
                     "name": "Axencia de Viaxes"
                 },
                 "piste": {
-                    "name": "Pista/Pista de Esquí"
+                    "name": "Pista/Pista de Esquí",
+                    "terms": "<translate with synonyms or related terms for 'Piste/Ski Trail', separated by commas>"
                 },
                 "place": {
                     "name": "Lugar"
                 },
                 "place/city": {
-                    "name": "Cidade"
+                    "name": "Cidade",
+                    "terms": "<translate with synonyms or related terms for 'City', separated by commas>"
                 },
                 "place/farm": {
                     "name": "Granxa"
                 },
                 "place/hamlet": {
-                    "name": "Aldea"
+                    "name": "Aldea",
+                    "terms": "<translate with synonyms or related terms for 'Hamlet', separated by commas>"
                 },
                 "place/island": {
                     "name": "Illa",
                     "terms": "illa, isla, illote, insua"
                 },
                 "place/isolated_dwelling": {
-                    "name": "Vivenda illada"
+                    "name": "Vivenda illada",
+                    "terms": "<translate with synonyms or related terms for 'Isolated Dwelling', separated by commas>"
                 },
                 "place/locality": {
-                    "name": "Lugar"
+                    "name": "Lugar",
+                    "terms": "<translate with synonyms or related terms for 'Locality', separated by commas>"
                 },
                 "place/neighbourhood": {
-                    "name": "Barrio"
+                    "name": "Barrio",
+                    "terms": "<translate with synonyms or related terms for 'Neighborhood', separated by commas>"
                 },
                 "place/quarter": {
-                    "name": "Sub-Borough / Quarter"
+                    "name": "Sub-Borough / Quarter",
+                    "terms": "<translate with synonyms or related terms for 'Sub-Borough / Quarter', separated by commas>"
                 },
                 "place/square": {
-                    "name": "Esquina"
+                    "name": "Esquina",
+                    "terms": "<translate with synonyms or related terms for 'Square', separated by commas>"
                 },
                 "place/suburb": {
-                    "name": "Barrio / Suburbio"
+                    "name": "Barrio / Suburbio",
+                    "terms": "<translate with synonyms or related terms for 'Borough / Suburb', separated by commas>"
                 },
                 "place/town": {
-                    "name": "Cidade"
+                    "name": "Cidade",
+                    "terms": "<translate with synonyms or related terms for 'Town', separated by commas>"
                 },
                 "place/village": {
-                    "name": "Vila"
+                    "name": "Vila",
+                    "terms": "<translate with synonyms or related terms for 'Village', separated by commas>"
                 },
                 "point": {
-                    "name": "Punto"
+                    "name": "Punto",
+                    "terms": "<translate with synonyms or related terms for 'Point', separated by commas>"
                 },
                 "power": {
                     "name": "Rede eléctrica"
                 },
                 "power/generator": {
-                    "name": "Xerador de enerxía"
+                    "name": "Xerador de enerxía",
+                    "terms": "<translate with synonyms or related terms for 'Power Generator', separated by commas>"
+                },
+                "power/generator/source_nuclear": {
+                    "name": "Reactor Nuclear",
+                    "terms": "<translate with synonyms or related terms for 'Nuclear Reactor', separated by commas>"
+                },
+                "power/generator/source_wind": {
+                    "name": "Turbina eólica",
+                    "terms": "<translate with synonyms or related terms for 'Wind Turbine', separated by commas>"
                 },
                 "power/line": {
-                    "name": "Liña de alta tensión"
+                    "name": "Liña de alta tensión",
+                    "terms": "<translate with synonyms or related terms for 'Power Line', separated by commas>"
                 },
                 "power/minor_line": {
-                    "name": "Liña Eléctrica de Baixa Tensión"
+                    "name": "Liña Eléctrica de Baixa Tensión",
+                    "terms": "<translate with synonyms or related terms for 'Minor Power Line', separated by commas>"
                 },
                 "power/plant": {
-                    "name": "Estación Central Eléctrica"
+                    "name": "Estación Central Eléctrica",
+                    "terms": "<translate with synonyms or related terms for 'Power Station Grounds', separated by commas>"
                 },
                 "power/pole": {
-                    "name": "Poste eléctrico"
+                    "name": "Poste eléctrico",
+                    "terms": "<translate with synonyms or related terms for 'Power Pole', separated by commas>"
                 },
                 "power/sub_station": {
                     "name": "Subestación"
                 },
                 "power/substation": {
-                    "name": "Subestación"
+                    "name": "Subestación",
+                    "terms": "<translate with synonyms or related terms for 'Substation', separated by commas>"
                 },
                 "power/tower": {
-                    "name": "Torre de Alta Tensión"
+                    "name": "Torre de Alta Tensión",
+                    "terms": "<translate with synonyms or related terms for 'High-Voltage Tower', separated by commas>"
                 },
                 "power/transformer": {
-                    "name": "Transformador"
+                    "name": "Transformador",
+                    "terms": "<translate with synonyms or related terms for 'Transformer', separated by commas>"
                 },
                 "public_transport/platform": {
-                    "name": "Plataforma"
+                    "name": "Plataforma",
+                    "terms": "<translate with synonyms or related terms for 'Platform', separated by commas>"
                 },
                 "public_transport/stop_position": {
-                    "name": "Posición de Stop"
+                    "name": "Posición de Stop",
+                    "terms": "<translate with synonyms or related terms for 'Stop Position', separated by commas>"
                 },
                 "railway": {
                     "name": "Ferrocarril"
                 },
                 "railway/abandoned": {
-                    "name": "Ferrocarril abandonado"
+                    "name": "Ferrocarril abandonado",
+                    "terms": "<translate with synonyms or related terms for 'Abandoned Railway', separated by commas>"
                 },
                 "railway/crossing": {
-                    "name": "Cruce Ferroviario (Camiño)"
+                    "name": "Cruce Ferroviario (Camiño)",
+                    "terms": "<translate with synonyms or related terms for 'Railway Crossing (Path)', separated by commas>"
                 },
                 "railway/disused": {
-                    "name": "Ferrocarril en desuso"
+                    "name": "Ferrocarril en desuso",
+                    "terms": "<translate with synonyms or related terms for 'Disused Railway', separated by commas>"
                 },
                 "railway/funicular": {
-                    "name": "Funicular"
+                    "name": "Funicular",
+                    "terms": "<translate with synonyms or related terms for 'Funicular', separated by commas>"
                 },
                 "railway/halt": {
-                    "name": "Halt Ferroviario"
+                    "name": "Halt Ferroviario",
+                    "terms": "<translate with synonyms or related terms for 'Railway Halt', separated by commas>"
                 },
                 "railway/level_crossing": {
-                    "name": "Cruce Ferroviario (Estrada)"
+                    "name": "Cruce Ferroviario (Estrada)",
+                    "terms": "<translate with synonyms or related terms for 'Railway Crossing (Road)', separated by commas>"
                 },
                 "railway/monorail": {
-                    "name": "Monorraíl"
+                    "name": "Monorraíl",
+                    "terms": "<translate with synonyms or related terms for 'Monorail', separated by commas>"
                 },
                 "railway/narrow_gauge": {
-                    "name": "Tren de Vía Estreita"
+                    "name": "Tren de Vía Estreita",
+                    "terms": "<translate with synonyms or related terms for 'Narrow Gauge Rail', separated by commas>"
                 },
                 "railway/platform": {
-                    "name": "Plataforma"
+                    "name": "Plataforma",
+                    "terms": "<translate with synonyms or related terms for 'Railway Platform', separated by commas>"
                 },
                 "railway/rail": {
-                    "name": "Vía de tren"
+                    "name": "Vía de tren",
+                    "terms": "<translate with synonyms or related terms for 'Rail', separated by commas>"
                 },
                 "railway/station": {
-                    "name": "Estación de ferrocarril"
+                    "name": "Estación de ferrocarril",
+                    "terms": "<translate with synonyms or related terms for 'Railway Station', separated by commas>"
                 },
                 "railway/subway": {
-                    "name": "Metro"
+                    "name": "Metro",
+                    "terms": "<translate with synonyms or related terms for 'Subway', separated by commas>"
                 },
                 "railway/subway_entrance": {
-                    "name": "Entrada de metro"
+                    "name": "Entrada de metro",
+                    "terms": "<translate with synonyms or related terms for 'Subway Entrance', separated by commas>"
                 },
                 "railway/tram": {
-                    "name": "Tranvía"
+                    "name": "Tranvía",
+                    "terms": "<translate with synonyms or related terms for 'Tram', separated by commas>"
                 },
                 "railway/tram_stop": {
-                    "name": "Parada de Tranvía"
+                    "name": "Parada de Tranvía",
+                    "terms": "<translate with synonyms or related terms for 'Tram Stop', separated by commas>"
                 },
                 "relation": {
-                    "name": "Relación"
+                    "name": "Relación",
+                    "terms": "<translate with synonyms or related terms for 'Relation', separated by commas>"
                 },
                 "roundabout": {
                     "name": "Rotonda"
                 },
                 "route/ferry": {
-                    "name": "Ruta de Ferry"
+                    "name": "Ruta de Ferry",
+                    "terms": "<translate with synonyms or related terms for 'Ferry Route', separated by commas>"
                 },
                 "shop": {
-                    "name": "Tenda"
+                    "name": "Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Shop', separated by commas>"
                 },
                 "shop/alcohol": {
-                    "name": "Licorería"
+                    "name": "Licorería",
+                    "terms": "<translate with synonyms or related terms for 'Liquor Store', separated by commas>"
                 },
                 "shop/anime": {
-                    "name": "Anime Tenda"
+                    "name": "Anime Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Anime Shop', separated by commas>"
                 },
                 "shop/antiques": {
-                    "name": "Antiguidades Tenda"
+                    "name": "Antiguidades Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Antiques Shop', separated by commas>"
                 },
                 "shop/appliance": {
-                    "name": "Tenda de Electrodomésticos"
+                    "name": "Tenda de Electrodomésticos",
+                    "terms": "<translate with synonyms or related terms for 'Appliance Store', separated by commas>"
                 },
                 "shop/art": {
-                    "name": "Galería de Arte"
+                    "name": "Galería de Arte",
+                    "terms": "<translate with synonyms or related terms for 'Art Store', separated by commas>"
                 },
                 "shop/baby_goods": {
-                    "name": "Mercadorías para Bebés Tenda"
+                    "name": "Mercadorías para Bebés Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Baby Goods Store', separated by commas>"
                 },
                 "shop/bag": {
-                    "name": "Maletas/Equipaxe Tenda"
+                    "name": "Maletas/Equipaxe Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Bag/Luggage Store', separated by commas>"
                 },
                 "shop/bakery": {
-                    "name": "Panadería"
+                    "name": "Panadería",
+                    "terms": "<translate with synonyms or related terms for 'Bakery', separated by commas>"
                 },
                 "shop/bathroom_furnishing": {
-                    "name": "Tenda de Mobiliario de Baño"
+                    "name": "Tenda de Mobiliario de Baño",
+                    "terms": "<translate with synonyms or related terms for 'Bathroom Furnishing Store', separated by commas>"
                 },
                 "shop/beauty": {
-                    "name": "Salón de beleza"
+                    "name": "Salón de beleza",
+                    "terms": "<translate with synonyms or related terms for 'Beauty Shop', separated by commas>"
                 },
                 "shop/beauty/nails": {
-                    "name": "Salón de Unllas"
+                    "name": "Salón de Unllas",
+                    "terms": "<translate with synonyms or related terms for 'Nail Salon', separated by commas>"
                 },
                 "shop/beauty/tanning": {
-                    "name": "Salón de Bronceado"
+                    "name": "Salón de Bronceado",
+                    "terms": "<translate with synonyms or related terms for 'Tanning Salon', separated by commas>"
                 },
                 "shop/bed": {
-                    "name": "Ropa de cama/colchón"
+                    "name": "Ropa de cama/colchón",
+                    "terms": "<translate with synonyms or related terms for 'Bedding/Mattress Store', separated by commas>"
                 },
                 "shop/beverages": {
-                    "name": "Tenda de Bebidas"
+                    "name": "Tenda de Bebidas",
+                    "terms": "<translate with synonyms or related terms for 'Beverage Store', separated by commas>"
                 },
                 "shop/bicycle": {
-                    "name": "Tenda de bicicletas"
+                    "name": "Tenda de bicicletas",
+                    "terms": "<translate with synonyms or related terms for 'Bicycle Shop', separated by commas>"
                 },
                 "shop/bookmaker": {
-                    "name": "Corredor de Apostas"
+                    "name": "Corredor de Apostas",
+                    "terms": "<translate with synonyms or related terms for 'Bookmaker', separated by commas>"
                 },
                 "shop/books": {
-                    "name": "Libraría"
+                    "name": "Libraría",
+                    "terms": "<translate with synonyms or related terms for 'Book Store', separated by commas>"
                 },
                 "shop/boutique": {
-                    "name": "Boutique"
+                    "name": "Boutique",
+                    "terms": "<translate with synonyms or related terms for 'Boutique', separated by commas>"
                 },
                 "shop/butcher": {
-                    "name": "Carnicería"
+                    "name": "Carnicería",
+                    "terms": "<translate with synonyms or related terms for 'Butcher', separated by commas>"
                 },
                 "shop/candles": {
-                    "name": "Tenda de Velas"
+                    "name": "Tenda de Velas",
+                    "terms": "<translate with synonyms or related terms for 'Candle Shop', separated by commas>"
                 },
                 "shop/car": {
-                    "name": "Concesionario"
+                    "name": "Concesionario",
+                    "terms": "<translate with synonyms or related terms for 'Car Dealership', separated by commas>"
                 },
                 "shop/car_parts": {
-                    "name": "Tenda de recambios de automóbiles"
+                    "name": "Tenda de recambios de automóbiles",
+                    "terms": "<translate with synonyms or related terms for 'Car Parts Store', separated by commas>"
                 },
                 "shop/car_repair": {
-                    "name": "Taller de reparación de vehículos"
+                    "name": "Taller de reparación de vehículos",
+                    "terms": "<translate with synonyms or related terms for 'Car Repair Shop', separated by commas>"
                 },
                 "shop/carpet": {
-                    "name": "Alfombras Tenda"
+                    "name": "Alfombras Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Carpet Store', separated by commas>"
                 },
                 "shop/charity": {
-                    "name": "Tenda Solidaria"
+                    "name": "Tenda Solidaria",
+                    "terms": "<translate with synonyms or related terms for 'Charity Store', separated by commas>"
                 },
                 "shop/cheese": {
-                    "name": "Queixos Tenda"
+                    "name": "Queixos Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Cheese Store', separated by commas>"
                 },
                 "shop/chemist": {
-                    "name": "Droguería"
+                    "name": "Droguería",
+                    "terms": "<translate with synonyms or related terms for 'Drugstore', separated by commas>"
                 },
                 "shop/chocolate": {
-                    "name": "Chocolatería"
+                    "name": "Chocolatería",
+                    "terms": "<translate with synonyms or related terms for 'Chocolate Store', separated by commas>"
                 },
                 "shop/clothes": {
-                    "name": "Tenda de roupa"
+                    "name": "Tenda de roupa",
+                    "terms": "<translate with synonyms or related terms for 'Clothing Store', separated by commas>"
                 },
                 "shop/coffee": {
-                    "name": "Tenda de Café"
+                    "name": "Tenda de Café",
+                    "terms": "<translate with synonyms or related terms for 'Coffee Store', separated by commas>"
                 },
                 "shop/computer": {
-                    "name": "Tenda de informática"
+                    "name": "Tenda de informática",
+                    "terms": "<translate with synonyms or related terms for 'Computer Store', separated by commas>"
                 },
                 "shop/confectionery": {
-                    "name": "Larpeiradas Tenda"
+                    "name": "Larpeiradas Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Candy Store', separated by commas>"
                 },
                 "shop/convenience": {
-                    "name": "Tenda de Barrio"
+                    "name": "Tenda de Barrio",
+                    "terms": "<translate with synonyms or related terms for 'Convenience Store', separated by commas>"
                 },
                 "shop/copyshop": {
-                    "name": "Copistería"
+                    "name": "Copistería",
+                    "terms": "<translate with synonyms or related terms for 'Copy Store', separated by commas>"
                 },
                 "shop/cosmetics": {
-                    "name": "Tenda de Cosméticos"
+                    "name": "Tenda de Cosméticos",
+                    "terms": "<translate with synonyms or related terms for 'Cosmetics Store', separated by commas>"
                 },
                 "shop/craft": {
-                    "name": "Artes e oficios tenda"
+                    "name": "Artes e oficios tenda",
+                    "terms": "<translate with synonyms or related terms for 'Arts and Crafts Store', separated by commas>"
                 },
                 "shop/curtain": {
-                    "name": "Tenda de Cortinas"
+                    "name": "Tenda de Cortinas",
+                    "terms": "<translate with synonyms or related terms for 'Curtain Store', separated by commas>"
                 },
                 "shop/dairy": {
-                    "name": "Tenda de Lácteos"
+                    "name": "Tenda de Lácteos",
+                    "terms": "<translate with synonyms or related terms for 'Dairy Store', separated by commas>"
                 },
                 "shop/deli": {
-                    "name": "Delicatessen"
+                    "name": "Delicatessen",
+                    "terms": "<translate with synonyms or related terms for 'Deli', separated by commas>"
                 },
                 "shop/department_store": {
-                    "name": "Grandes almacéns"
+                    "name": "Grandes almacéns",
+                    "terms": "<translate with synonyms or related terms for 'Department Store', separated by commas>"
                 },
                 "shop/doityourself": {
-                    "name": "Bricolaxe DIY"
+                    "name": "Bricolaxe DIY",
+                    "terms": "<translate with synonyms or related terms for 'DIY Store', separated by commas>"
                 },
                 "shop/dry_cleaning": {
-                    "name": "Lavandería en Seco"
+                    "name": "Lavandería en Seco",
+                    "terms": "<translate with synonyms or related terms for 'Dry Cleaner', separated by commas>"
                 },
                 "shop/e-cigarette": {
-                    "name": "E-Cigarros Tenda"
+                    "name": "E-Cigarros Tenda",
+                    "terms": "<translate with synonyms or related terms for 'E-Cigarette Shop', separated by commas>"
                 },
                 "shop/electronics": {
-                    "name": "Tenda de electrodomésticos"
+                    "name": "Tenda de electrodomésticos",
+                    "terms": "<translate with synonyms or related terms for 'Electronics Store', separated by commas>"
                 },
                 "shop/erotic": {
-                    "name": "Erótica Tenda"
+                    "name": "Erótica Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Erotic Store', separated by commas>"
                 },
                 "shop/fabric": {
-                    "name": "Tenda de Teas"
+                    "name": "Tenda de Teas",
+                    "terms": "<translate with synonyms or related terms for 'Fabric Store', separated by commas>"
                 },
                 "shop/farm": {
-                    "name": "Cesta de produtos"
+                    "name": "Cesta de produtos",
+                    "terms": "<translate with synonyms or related terms for 'Produce Stand', separated by commas>"
                 },
                 "shop/fashion": {
-                    "name": "Tenda de Moda"
+                    "name": "Tenda de Moda",
+                    "terms": "<translate with synonyms or related terms for 'Fashion Store', separated by commas>"
                 },
                 "shop/fishmonger": {
                     "name": "Peixeiro"
                 },
                 "shop/florist": {
-                    "name": "Florería"
+                    "name": "Florería",
+                    "terms": "<translate with synonyms or related terms for 'Florist', separated by commas>"
                 },
                 "shop/frame": {
-                    "name": "Marcos Tenda"
+                    "name": "Marcos Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Framing Shop', separated by commas>"
                 },
                 "shop/funeral_directors": {
-                    "name": "Funeraria"
+                    "name": "Funeraria",
+                    "terms": "<translate with synonyms or related terms for 'Funeral Home', separated by commas>"
                 },
                 "shop/furnace": {
-                    "name": "Fornos Tenda"
+                    "name": "Fornos Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Furnace Store', separated by commas>"
                 },
                 "shop/furniture": {
-                    "name": "Tenda de mobles"
+                    "name": "Tenda de mobles",
+                    "terms": "<translate with synonyms or related terms for 'Furniture Store', separated by commas>"
                 },
                 "shop/garden_centre": {
-                    "name": "Centro de xardinería"
+                    "name": "Centro de xardinería",
+                    "terms": "<translate with synonyms or related terms for 'Garden Center', separated by commas>"
                 },
                 "shop/gas": {
-                    "name": "Bombonas Gas Tenda"
+                    "name": "Bombonas Gas Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Bottled Gas Shop', separated by commas>"
                 },
                 "shop/gift": {
-                    "name": "Tenda de Regalos"
+                    "name": "Tenda de Regalos",
+                    "terms": "<translate with synonyms or related terms for 'Gift Shop', separated by commas>"
                 },
                 "shop/greengrocer": {
-                    "name": "Froitería"
+                    "name": "Froitería",
+                    "terms": "<translate with synonyms or related terms for 'Greengrocer', separated by commas>"
                 },
                 "shop/hairdresser": {
-                    "name": "Perruquería"
+                    "name": "Perruquería",
+                    "terms": "<translate with synonyms or related terms for 'Hairdresser', separated by commas>"
                 },
                 "shop/hardware": {
-                    "name": "Ferretería"
+                    "name": "Ferretería",
+                    "terms": "<translate with synonyms or related terms for 'Hardware Store', separated by commas>"
                 },
                 "shop/hearing_aids": {
-                    "name": "Audífonos Tenda"
+                    "name": "Audífonos Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Hearing Aids Store', separated by commas>"
                 },
                 "shop/herbalist": {
-                    "name": "Herborista"
+                    "name": "Herborista",
+                    "terms": "<translate with synonyms or related terms for 'Herbalist', separated by commas>"
                 },
                 "shop/hifi": {
-                    "name": "Hifi Tenda"
+                    "name": "Hifi Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Hifi Store', separated by commas>"
                 },
                 "shop/houseware": {
-                    "name": "Electrodomésticos Tenda"
+                    "name": "Electrodomésticos Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Houseware Store', separated by commas>"
                 },
                 "shop/interior_decoration": {
-                    "name": "Decoración Interiores Tenda"
+                    "name": "Decoración Interiores Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Interior Decoration Store', separated by commas>"
                 },
                 "shop/jewelry": {
-                    "name": "Xoiería"
+                    "name": "Xoiería",
+                    "terms": "<translate with synonyms or related terms for 'Jeweler', separated by commas>"
                 },
                 "shop/kiosk": {
-                    "name": "Kiosko Xornais"
+                    "name": "Kiosko Xornais",
+                    "terms": "<translate with synonyms or related terms for 'News Kiosk', separated by commas>"
                 },
                 "shop/kitchen": {
-                    "name": "Deseño Cociñas Tenda"
+                    "name": "Deseño Cociñas Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Kitchen Design Store', separated by commas>"
                 },
                 "shop/laundry": {
-                    "name": "Lavandería"
+                    "name": "Lavandería",
+                    "terms": "<translate with synonyms or related terms for 'Laundry', separated by commas>"
                 },
                 "shop/leather": {
-                    "name": "Tenda de Peles"
+                    "name": "Tenda de Peles",
+                    "terms": "<translate with synonyms or related terms for 'Leather Store', separated by commas>"
                 },
                 "shop/locksmith": {
-                    "name": "Cerraxeiro"
+                    "name": "Cerraxeiro",
+                    "terms": "<translate with synonyms or related terms for 'Locksmith', separated by commas>"
                 },
                 "shop/lottery": {
-                    "name": "Tenda de Lotería"
+                    "name": "Tenda de Lotería",
+                    "terms": "<translate with synonyms or related terms for 'Lottery Shop', separated by commas>"
                 },
                 "shop/mall": {
-                    "name": "Centro comercial"
+                    "name": "Centro comercial",
+                    "terms": "<translate with synonyms or related terms for 'Mall', separated by commas>"
                 },
                 "shop/massage": {
-                    "name": "Fisioterapia"
+                    "name": "Fisioterapia",
+                    "terms": "<translate with synonyms or related terms for 'Massage Shop', separated by commas>"
                 },
                 "shop/medical_supply": {
-                    "name": "Tenda de suministros médicos"
+                    "name": "Tenda de suministros médicos",
+                    "terms": "<translate with synonyms or related terms for 'Medical Supply Store', separated by commas>"
                 },
                 "shop/mobile_phone": {
-                    "name": "Tenda de telefonía móvil"
+                    "name": "Tenda de telefonía móvil",
+                    "terms": "<translate with synonyms or related terms for 'Mobile Phone Store', separated by commas>"
                 },
                 "shop/money_lender": {
-                    "name": "Usureiro"
+                    "name": "Usureiro",
+                    "terms": "<translate with synonyms or related terms for 'Money Lender', separated by commas>"
                 },
                 "shop/motorcycle": {
-                    "name": "Concesionario de motocicletas"
+                    "name": "Concesionario de motocicletas",
+                    "terms": "<translate with synonyms or related terms for 'Motorcycle Dealership', separated by commas>"
                 },
                 "shop/music": {
-                    "name": "Tenda de música"
+                    "name": "Tenda de música",
+                    "terms": "<translate with synonyms or related terms for 'Music Store', separated by commas>"
                 },
                 "shop/musical_instrument": {
-                    "name": "Tenda Instrumentos Musicais"
+                    "name": "Tenda Instrumentos Musicais",
+                    "terms": "<translate with synonyms or related terms for 'Musical Instrument Store', separated by commas>"
                 },
                 "shop/newsagent": {
-                    "name": "Xornais/Revistas Tenda"
+                    "name": "Xornais/Revistas Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Newspaper/Magazine Shop', separated by commas>"
                 },
                 "shop/nutrition_supplements": {
-                    "name": "Nutrición Suplemento Tenda"
+                    "name": "Nutrición Suplemento Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Nutrition Supplements Store', separated by commas>"
                 },
                 "shop/optician": {
-                    "name": "Óptica"
+                    "name": "Óptica",
+                    "terms": "<translate with synonyms or related terms for 'Optician', separated by commas>"
                 },
                 "shop/organic": {
-                    "name": "Produtos Ecolóxicos Tenda"
+                    "name": "Produtos Ecolóxicos Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Organic Goods Store', separated by commas>"
                 },
                 "shop/outdoor": {
-                    "name": "Tenda ao aire libre"
+                    "name": "Tenda ao aire libre",
+                    "terms": "<translate with synonyms or related terms for 'Outdoors Store', separated by commas>"
                 },
                 "shop/paint": {
-                    "name": "Pintura Tenda"
+                    "name": "Pintura Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Paint Store', separated by commas>"
                 },
                 "shop/pastry": {
-                    "name": "Confitería"
+                    "name": "Confitería",
+                    "terms": "<translate with synonyms or related terms for 'Pastry Shop', separated by commas>"
                 },
                 "shop/pawnbroker": {
-                    "name": "Casa de Empeños"
+                    "name": "Casa de Empeños",
+                    "terms": "<translate with synonyms or related terms for 'Pawn Shop', separated by commas>"
                 },
                 "shop/perfumery": {
-                    "name": "Perfumaría"
+                    "name": "Perfumaría",
+                    "terms": "<translate with synonyms or related terms for 'Perfume Store', separated by commas>"
                 },
                 "shop/pet": {
-                    "name": "Tenda de mascotas"
+                    "name": "Tenda de mascotas",
+                    "terms": "<translate with synonyms or related terms for 'Pet Store', separated by commas>"
                 },
                 "shop/photo": {
-                    "name": "Tenda de Fotografía"
+                    "name": "Tenda de Fotografía",
+                    "terms": "<translate with synonyms or related terms for 'Photography Store', separated by commas>"
                 },
                 "shop/pyrotechnics": {
-                    "name": "Fogos artificiais tenda"
+                    "name": "Fogos artificiais tenda",
+                    "terms": "<translate with synonyms or related terms for 'Fireworks Store', separated by commas>"
                 },
                 "shop/radiotechnics": {
-                    "name": "Radio/Electrónica, Tenda de Compoñentes"
+                    "name": "Radio/Electrónica, Tenda de Compoñentes",
+                    "terms": "<translate with synonyms or related terms for 'Radio/Electronic Component Store', separated by commas>"
                 },
                 "shop/religion": {
-                    "name": "Relixiosa Tenda"
+                    "name": "Relixiosa Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Religious Store', separated by commas>"
                 },
                 "shop/scuba_diving": {
-                    "name": "Mergullo Tenda"
+                    "name": "Mergullo Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Scuba Diving Shop', separated by commas>"
                 },
                 "shop/seafood": {
-                    "name": "Tenda de Mariscos"
+                    "name": "Tenda de Mariscos",
+                    "terms": "<translate with synonyms or related terms for 'Seafood Shop', separated by commas>"
                 },
                 "shop/second_hand": {
-                    "name": "Consigna/tenda de segunda man"
+                    "name": "Consigna/tenda de segunda man",
+                    "terms": "<translate with synonyms or related terms for 'Consignment/Thrift Store', separated by commas>"
                 },
                 "shop/shoes": {
-                    "name": "Zapatería"
+                    "name": "Zapatería",
+                    "terms": "<translate with synonyms or related terms for 'Shoe Store', separated by commas>"
                 },
                 "shop/sports": {
-                    "name": "Deportiva Tenda"
+                    "name": "Deportiva Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Sporting Goods Store', separated by commas>"
                 },
                 "shop/stationery": {
-                    "name": "Papelería"
+                    "name": "Papelería",
+                    "terms": "<translate with synonyms or related terms for 'Stationery Store', separated by commas>"
                 },
                 "shop/storage_rental": {
-                    "name": "Aluguer de Almacéns"
+                    "name": "Aluguer de Almacéns",
+                    "terms": "<translate with synonyms or related terms for 'Storage Rental', separated by commas>"
                 },
                 "shop/supermarket": {
-                    "name": "Supermercado"
+                    "name": "Supermercado",
+                    "terms": "<translate with synonyms or related terms for 'Supermarket', separated by commas>"
                 },
                 "shop/tailor": {
-                    "name": "Xastre"
+                    "name": "Xastre",
+                    "terms": "<translate with synonyms or related terms for 'Tailor', separated by commas>"
                 },
                 "shop/tattoo": {
-                    "name": "Salón de Tatuaxes"
+                    "name": "Salón de Tatuaxes",
+                    "terms": "<translate with synonyms or related terms for 'Tattoo Parlor', separated by commas>"
                 },
                 "shop/tea": {
-                    "name": "Te Tenda"
+                    "name": "Te Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Tea Store', separated by commas>"
                 },
                 "shop/ticket": {
-                    "name": "Venda de Entradas"
+                    "name": "Venda de Entradas",
+                    "terms": "<translate with synonyms or related terms for 'Ticket Seller', separated by commas>"
                 },
                 "shop/tobacco": {
-                    "name": "Estanco"
+                    "name": "Estanco",
+                    "terms": "<translate with synonyms or related terms for 'Tobacco Shop', separated by commas>"
                 },
                 "shop/toys": {
-                    "name": "Tenda de xoguetes"
+                    "name": "Tenda de xoguetes",
+                    "terms": "<translate with synonyms or related terms for 'Toy Store', separated by commas>"
                 },
                 "shop/travel_agency": {
-                    "name": "Axencia de viaxes"
+                    "name": "Axencia de viaxes",
+                    "terms": "<translate with synonyms or related terms for 'Travel Agency', separated by commas>"
                 },
                 "shop/tyres": {
-                    "name": "Tenda de neumáticos"
+                    "name": "Tenda de neumáticos",
+                    "terms": "<translate with synonyms or related terms for 'Tire Store', separated by commas>"
                 },
                 "shop/vacant": {
                     "name": "Local baleiro"
                 },
                 "shop/vacuum_cleaner": {
-                    "name": "Aspiradoras Tenda"
+                    "name": "Aspiradoras Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Vacuum Cleaner Store', separated by commas>"
                 },
                 "shop/variety_store": {
-                    "name": "Tenda de Variedades"
+                    "name": "Tenda de Variedades",
+                    "terms": "<translate with synonyms or related terms for 'Variety Store', separated by commas>"
                 },
                 "shop/video": {
-                    "name": "Videoclub"
+                    "name": "Videoclub",
+                    "terms": "<translate with synonyms or related terms for 'Video Store', separated by commas>"
                 },
                 "shop/video_games": {
-                    "name": "Video Xogos Tenda"
+                    "name": "Video Xogos Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Video Game Store', separated by commas>"
                 },
                 "shop/watches": {
-                    "name": "Reloxería"
+                    "name": "Reloxería",
+                    "terms": "<translate with synonyms or related terms for 'Watches Shop', separated by commas>"
                 },
                 "shop/water_sports": {
-                    "name": "Deportes acuáticos/tenda de natación"
+                    "name": "Deportes acuáticos/tenda de natación",
+                    "terms": "<translate with synonyms or related terms for 'Watersport/Swim Shop', separated by commas>"
                 },
                 "shop/weapons": {
-                    "name": "Armería"
+                    "name": "Armería",
+                    "terms": "<translate with synonyms or related terms for 'Weapon Shop', separated by commas>"
                 },
                 "shop/window_blind": {
-                    "name": "Tenda de Venta a Cegas"
+                    "name": "Tenda de Venta a Cegas",
+                    "terms": "<translate with synonyms or related terms for 'Window Blind Store', separated by commas>"
                 },
                 "shop/wine": {
-                    "name": "Viño Tenda"
+                    "name": "Viño Tenda",
+                    "terms": "<translate with synonyms or related terms for 'Wine Shop', separated by commas>"
                 },
                 "tourism": {
-                    "name": "Turismo"
+                    "name": "Turismo",
+                    "terms": "<translate with synonyms or related terms for 'Tourism', separated by commas>"
                 },
                 "tourism/alpine_hut": {
-                    "name": "Cabana alpina"
+                    "name": "Cabana alpina",
+                    "terms": "<translate with synonyms or related terms for 'Alpine Hut', separated by commas>"
                 },
                 "tourism/apartment": {
-                    "name": "Apartamento de Convidados /Condo"
+                    "name": "Apartamento de Convidados /Condo",
+                    "terms": "<translate with synonyms or related terms for 'Guest Apartment / Condo', separated by commas>"
                 },
                 "tourism/aquarium": {
-                    "name": "Acuarium"
+                    "name": "Acuarium",
+                    "terms": "<translate with synonyms or related terms for 'Aquarium', separated by commas>"
                 },
                 "tourism/artwork": {
-                    "name": "Obra artística"
+                    "name": "Obra artística",
+                    "terms": "<translate with synonyms or related terms for 'Artwork', separated by commas>"
                 },
                 "tourism/attraction": {
-                    "name": "Atracción turística"
+                    "name": "Atracción turística",
+                    "terms": "<translate with synonyms or related terms for 'Tourist Attraction', separated by commas>"
                 },
                 "tourism/camp_site": {
-                    "name": "Área de camping"
+                    "name": "Área de camping",
+                    "terms": "<translate with synonyms or related terms for 'Campground', separated by commas>"
                 },
                 "tourism/caravan_site": {
-                    "name": "Parque de Caravanas"
+                    "name": "Parque de Caravanas",
+                    "terms": "<translate with synonyms or related terms for 'RV Park', separated by commas>"
                 },
                 "tourism/chalet": {
-                    "name": "Chalé"
+                    "name": "Chalé",
+                    "terms": "<translate with synonyms or related terms for 'Chalet', separated by commas>"
                 },
                 "tourism/gallery": {
-                    "name": "Galería de Arte"
+                    "name": "Galería de Arte",
+                    "terms": "<translate with synonyms or related terms for 'Art Gallery', separated by commas>"
                 },
                 "tourism/guest_house": {
                     "name": "Hostal",
                     "terms": "hostal, pensión, hospedaxe, fonda, pousada, aloxamento, habitación"
                 },
                 "tourism/hostel": {
-                    "name": "Albergue"
+                    "name": "Albergue",
+                    "terms": "<translate with synonyms or related terms for 'Hostel', separated by commas>"
                 },
                 "tourism/hotel": {
-                    "name": "Hotel"
+                    "name": "Hotel",
+                    "terms": "<translate with synonyms or related terms for 'Hotel', separated by commas>"
                 },
                 "tourism/information": {
-                    "name": "Información"
+                    "name": "Información",
+                    "terms": "<translate with synonyms or related terms for 'Information', separated by commas>"
                 },
                 "tourism/information/board": {
-                    "name": "Placa de información"
+                    "name": "Placa de información",
+                    "terms": "<translate with synonyms or related terms for 'Information Board', separated by commas>"
                 },
                 "tourism/information/guidepost": {
-                    "name": "Posto Guía"
+                    "name": "Posto Guía",
+                    "terms": "<translate with synonyms or related terms for 'Guidepost', separated by commas>"
                 },
                 "tourism/information/map": {
-                    "name": "Mapa"
+                    "name": "Mapa",
+                    "terms": "<translate with synonyms or related terms for 'Map', separated by commas>"
                 },
                 "tourism/information/office": {
-                    "name": "Oficina de Información Turística"
+                    "name": "Oficina de Información Turística",
+                    "terms": "<translate with synonyms or related terms for 'Tourist Information Office', separated by commas>"
                 },
                 "tourism/motel": {
-                    "name": "Motel"
+                    "name": "Motel",
+                    "terms": "<translate with synonyms or related terms for 'Motel', separated by commas>"
                 },
                 "tourism/museum": {
-                    "name": "Museo"
+                    "name": "Museo",
+                    "terms": "<translate with synonyms or related terms for 'Museum', separated by commas>"
                 },
                 "tourism/picnic_site": {
-                    "name": "Zona de picnic"
+                    "name": "Zona de picnic",
+                    "terms": "<translate with synonyms or related terms for 'Picnic Site', separated by commas>"
                 },
                 "tourism/theme_park": {
-                    "name": "Parque de atraccións"
+                    "name": "Parque de atraccións",
+                    "terms": "<translate with synonyms or related terms for 'Theme Park', separated by commas>"
                 },
                 "tourism/viewpoint": {
-                    "name": "Miradoiro"
+                    "name": "Miradoiro",
+                    "terms": "<translate with synonyms or related terms for 'Viewpoint', separated by commas>"
                 },
                 "tourism/zoo": {
-                    "name": "Zoo"
+                    "name": "Zoo",
+                    "terms": "<translate with synonyms or related terms for 'Zoo', separated by commas>"
                 },
                 "traffic_calming": {
-                    "name": "Acougo de Tráfico"
+                    "name": "Acougo de Tráfico",
+                    "terms": "<translate with synonyms or related terms for 'Traffic Calming', separated by commas>"
                 },
                 "traffic_calming/bump": {
-                    "name": "Banda de frenado"
+                    "name": "Banda de frenado",
+                    "terms": "<translate with synonyms or related terms for 'Speed Bump', separated by commas>"
                 },
                 "traffic_calming/chicane": {
-                    "name": "Chicán de Tráfico"
+                    "name": "Chicán de Tráfico",
+                    "terms": "<translate with synonyms or related terms for 'Traffic Chicane', separated by commas>"
                 },
                 "traffic_calming/choker": {
-                    "name": "Choker de tráfico"
+                    "name": "Choker de tráfico",
+                    "terms": "<translate with synonyms or related terms for 'Traffic Choker', separated by commas>"
                 },
                 "traffic_calming/cushion": {
-                    "name": "Almofa de Velocidade"
+                    "name": "Almofa de Velocidade",
+                    "terms": "<translate with synonyms or related terms for 'Speed Cushion', separated by commas>"
                 },
                 "traffic_calming/dip": {
-                    "name": "Soterrado"
+                    "name": "Soterrado",
+                    "terms": "<translate with synonyms or related terms for 'Dip', separated by commas>"
                 },
                 "traffic_calming/hump": {
-                    "name": "Speed Hump"
+                    "name": "Speed Hump",
+                    "terms": "<translate with synonyms or related terms for 'Speed Hump', separated by commas>"
                 },
                 "traffic_calming/island": {
-                    "name": "Illa de Tráfico"
+                    "name": "Illa de Tráfico",
+                    "terms": "<translate with synonyms or related terms for 'Traffic Island', separated by commas>"
                 },
                 "traffic_calming/rumble_strip": {
-                    "name": "Rumble Faixa"
+                    "name": "Rumble Faixa",
+                    "terms": "<translate with synonyms or related terms for 'Rumble Strip', separated by commas>"
                 },
                 "traffic_calming/table": {
-                    "name": "Cruce Peonil Elevado"
+                    "name": "Cruce Peonil Elevado",
+                    "terms": "<translate with synonyms or related terms for 'Raised Pedestrian Crossing', separated by commas>"
                 },
                 "type/boundary": {
-                    "name": "Límite"
+                    "name": "Límite",
+                    "terms": "<translate with synonyms or related terms for 'Boundary', separated by commas>"
                 },
                 "type/boundary/administrative": {
-                    "name": "Límite administrativo"
+                    "name": "Límite administrativo",
+                    "terms": "<translate with synonyms or related terms for 'Administrative Boundary', separated by commas>"
                 },
                 "type/multipolygon": {
                     "name": "Multipolígono"
                 },
                 "type/restriction": {
-                    "name": "Restrición"
+                    "name": "Restrición",
+                    "terms": "<translate with synonyms or related terms for 'Restriction', separated by commas>"
                 },
                 "type/restriction/no_left_turn": {
-                    "name": "Prohibido xirar á esquerda"
+                    "name": "Prohibido xirar á esquerda",
+                    "terms": "<translate with synonyms or related terms for 'No Left Turn', separated by commas>"
                 },
                 "type/restriction/no_right_turn": {
-                    "name": "Prohibido xirar á dereita"
+                    "name": "Prohibido xirar á dereita",
+                    "terms": "<translate with synonyms or related terms for 'No Right Turn', separated by commas>"
                 },
                 "type/restriction/no_straight_on": {
-                    "name": "Non Pradiante"
+                    "name": "Non Pradiante",
+                    "terms": "<translate with synonyms or related terms for 'No Straight On', separated by commas>"
                 },
                 "type/restriction/no_u_turn": {
-                    "name": "Prohibido o cambio de sentido"
+                    "name": "Prohibido o cambio de sentido",
+                    "terms": "<translate with synonyms or related terms for 'No U-turn', separated by commas>"
                 },
                 "type/restriction/only_left_turn": {
-                    "name": "Obrigatorio xirar á esquerda"
+                    "name": "Obrigatorio xirar á esquerda",
+                    "terms": "<translate with synonyms or related terms for 'Left Turn Only', separated by commas>"
                 },
                 "type/restriction/only_right_turn": {
-                    "name": "Obrigatorio xirar á dereita"
+                    "name": "Obrigatorio xirar á dereita",
+                    "terms": "<translate with synonyms or related terms for 'Right Turn Only', separated by commas>"
                 },
                 "type/restriction/only_straight_on": {
-                    "name": "Obrigatorio continuar recto"
+                    "name": "Obrigatorio continuar recto",
+                    "terms": "<translate with synonyms or related terms for 'No Turns', separated by commas>"
                 },
                 "type/route": {
-                    "name": "Ruta"
+                    "name": "Ruta",
+                    "terms": "<translate with synonyms or related terms for 'Route', separated by commas>"
                 },
                 "type/route/bicycle": {
-                    "name": "Ruta ciclista"
+                    "name": "Ruta ciclista",
+                    "terms": "<translate with synonyms or related terms for 'Cycle Route', separated by commas>"
                 },
                 "type/route/bus": {
-                    "name": "Ruta de autobús"
+                    "name": "Ruta de autobús",
+                    "terms": "<translate with synonyms or related terms for 'Bus Route', separated by commas>"
                 },
                 "type/route/detour": {
-                    "name": "Ruta de Desvío"
+                    "name": "Ruta de Desvío",
+                    "terms": "<translate with synonyms or related terms for 'Detour Route', separated by commas>"
                 },
                 "type/route/ferry": {
-                    "name": "Ruta do Ferry"
+                    "name": "Ruta do Ferry",
+                    "terms": "<translate with synonyms or related terms for 'Ferry Route', separated by commas>"
                 },
                 "type/route/foot": {
-                    "name": "Rúa a Pé"
+                    "name": "Rúa a Pé",
+                    "terms": "<translate with synonyms or related terms for 'Foot Route', separated by commas>"
                 },
                 "type/route/hiking": {
-                    "name": "Ruta de Camiñata"
+                    "name": "Ruta de Camiñata",
+                    "terms": "<translate with synonyms or related terms for 'Hiking Route', separated by commas>"
                 },
                 "type/route/horse": {
-                    "name": "Ruta de Equitación"
+                    "name": "Ruta de Equitación",
+                    "terms": "<translate with synonyms or related terms for 'Riding Route', separated by commas>"
                 },
                 "type/route/pipeline": {
-                    "name": "Ruta de Tubaría"
+                    "name": "Ruta de Tubaría",
+                    "terms": "<translate with synonyms or related terms for 'Pipeline Route', separated by commas>"
                 },
                 "type/route/power": {
-                    "name": "Ruta de Enerxía"
+                    "name": "Ruta de Enerxía",
+                    "terms": "<translate with synonyms or related terms for 'Power Route', separated by commas>"
                 },
                 "type/route/road": {
-                    "name": "Ruta de Estrada"
+                    "name": "Ruta de Estrada",
+                    "terms": "<translate with synonyms or related terms for 'Road Route', separated by commas>"
                 },
                 "type/route/train": {
-                    "name": "Ruta de Tren"
+                    "name": "Ruta de Tren",
+                    "terms": "<translate with synonyms or related terms for 'Train Route', separated by commas>"
                 },
                 "type/route/tram": {
-                    "name": "Ruta de Tranvía"
+                    "name": "Ruta de Tranvía",
+                    "terms": "<translate with synonyms or related terms for 'Tram Route', separated by commas>"
                 },
                 "type/route_master": {
-                    "name": "Ruta Mestre"
+                    "name": "Ruta Mestre",
+                    "terms": "<translate with synonyms or related terms for 'Route Master', separated by commas>"
                 },
                 "type/site": {
-                    "name": "Lugar"
+                    "name": "Lugar",
+                    "terms": "<translate with synonyms or related terms for 'Site', separated by commas>"
                 },
                 "vertex": {
-                    "name": "Outro"
+                    "name": "Outro",
+                    "terms": "<translate with synonyms or related terms for 'Other', separated by commas>"
                 },
                 "waterway": {
                     "name": "Vía de Auga"
                 },
                 "waterway/boatyard": {
-                    "name": "Estaleiro"
+                    "name": "Estaleiro",
+                    "terms": "<translate with synonyms or related terms for 'Boatyard', separated by commas>"
                 },
                 "waterway/canal": {
-                    "name": "Canal"
+                    "name": "Canal",
+                    "terms": "<translate with synonyms or related terms for 'Canal', separated by commas>"
                 },
                 "waterway/dam": {
-                    "name": "Presa"
+                    "name": "Presa",
+                    "terms": "<translate with synonyms or related terms for 'Dam', separated by commas>"
                 },
                 "waterway/ditch": {
-                    "name": "Cuneta"
+                    "name": "Cuneta",
+                    "terms": "<translate with synonyms or related terms for 'Ditch', separated by commas>"
                 },
                 "waterway/dock": {
-                    "name": "Dique Húmido/Dique Seco"
+                    "name": "Dique Húmido/Dique Seco",
+                    "terms": "<translate with synonyms or related terms for 'Wet Dock / Dry Dock', separated by commas>"
                 },
                 "waterway/drain": {
-                    "name": "Cuneta"
+                    "name": "Cuneta",
+                    "terms": "<translate with synonyms or related terms for 'Drain', separated by commas>"
                 },
                 "waterway/fuel": {
-                    "name": "Estación Mariá de Fuel"
+                    "name": "Estación Mariá de Fuel",
+                    "terms": "<translate with synonyms or related terms for 'Marine Fuel Station', separated by commas>"
                 },
                 "waterway/river": {
                     "name": "Río",
                     "terms": "río, regato, afluente, auga"
                 },
                 "waterway/riverbank": {
-                    "name": "Ribeira do río"
+                    "name": "Ribeira do río",
+                    "terms": "<translate with synonyms or related terms for 'Riverbank', separated by commas>"
                 },
                 "waterway/sanitary_dump_station": {
-                    "name": "WC Mariño Eliminación"
+                    "name": "WC Mariño Eliminación",
+                    "terms": "<translate with synonyms or related terms for 'Marine Toilet Disposal', separated by commas>"
                 },
                 "waterway/stream": {
                     "name": "Regato",
                     "terms": "río, regato, rego, torrente, auga"
                 },
                 "waterway/water_point": {
-                    "name": "Auga Potable Mariña"
+                    "name": "Auga Potable Mariña",
+                    "terms": "<translate with synonyms or related terms for 'Marine Drinking Water', separated by commas>"
                 },
                 "waterway/waterfall": {
-                    "name": "Fervenza"
+                    "name": "Fervenza",
+                    "terms": "<translate with synonyms or related terms for 'Waterfall', separated by commas>"
                 },
                 "waterway/weir": {
-                    "name": "Presa"
+                    "name": "Presa",
+                    "terms": "<translate with synonyms or related terms for 'Weir', separated by commas>"
                 }
             }
         },
diff --git a/dist/locales/hr.json b/dist/locales/hr.json
index b428fbbd7..e1d293977 100644
--- a/dist/locales/hr.json
+++ b/dist/locales/hr.json
@@ -1204,9 +1204,6 @@
                 "contact/webcam": {
                     "placeholder": "http://primjer.hr/"
                 },
-                "content": {
-                    "label": "Sadržaj"
-                },
                 "country": {
                     "label": "Država"
                 },
diff --git a/dist/locales/hu.json b/dist/locales/hu.json
index 03a683152..f8d596ea6 100644
--- a/dist/locales/hu.json
+++ b/dist/locales/hu.json
@@ -1355,9 +1355,6 @@
                     "label": "Webkamera URL",
                     "placeholder": "http://pelda.hu/"
                 },
-                "content": {
-                    "label": "Tartalom"
-                },
                 "country": {
                     "label": "Ország"
                 },
@@ -3491,7 +3488,7 @@
                     "terms": "Emlékhely"
                 },
                 "historic/monument": {
-                    "name": "Kiemelkedően jelentős emlékmű",
+                    "name": "Monumentális, épületszerű emlékmű",
                     "terms": "monumentális emlékmű"
                 },
                 "historic/ruins": {
diff --git a/dist/locales/hy.json b/dist/locales/hy.json
index c380d60f6..3dc786697 100644
--- a/dist/locales/hy.json
+++ b/dist/locales/hy.json
@@ -693,9 +693,6 @@
                 "construction": {
                     "label": "Տեսակ"
                 },
-                "content": {
-                    "label": "Բովանդակութիւն"
-                },
                 "country": {
                     "label": "Երկիր"
                 },
diff --git a/dist/locales/it.json b/dist/locales/it.json
index 6132bd249..e0a959cff 100644
--- a/dist/locales/it.json
+++ b/dist/locales/it.json
@@ -1289,9 +1289,6 @@
                     "label": "URL webcam",
                     "placeholder": "http://example.com/"
                 },
-                "content": {
-                    "label": "Contenuto"
-                },
                 "country": {
                     "label": "Stato"
                 },
diff --git a/dist/locales/ja.json b/dist/locales/ja.json
index 2263532c6..1047af9f9 100644
--- a/dist/locales/ja.json
+++ b/dist/locales/ja.json
@@ -1184,9 +1184,6 @@
                     "label": "ウェブカメラのURL",
                     "placeholder": "http://example.com/"
                 },
-                "content": {
-                    "label": "中身"
-                },
                 "country": {
                     "label": "国"
                 },
diff --git a/dist/locales/kn.json b/dist/locales/kn.json
index b6cde6c5c..d17c937d0 100644
--- a/dist/locales/kn.json
+++ b/dist/locales/kn.json
@@ -329,9 +329,9 @@
         "commit": {
             "title": "ಓಪೆನ್‌ಸ್ಟ್ರೀಟ್ಮ್ಯಾಪ್ ಜಾಲಕ್ಕೆ ನಿಮ್ಮ ಬದಲಾವಣೆಗಳನ್ನು ರವಾನಿಸಿ.   ",
             "description_placeholder": "ನೀವು ಮಾಡಿದ ಬದಲಾವಣೆಗಳ ಬಗ್ಗೆ ಒಂದು ಚಿಕ್ಕ ವಿವರಣೆ (ಅವಶ್ಯಕ).",
-            "message_label": "ಬದಲಿಸಿದಗುಂಪು ವ್ಯಾಖ್ಯೆ ",
+            "message_label": "ಬದಲಾವಣೆಗಳ ಸಾರಾಂಶ",
             "upload_explanation": "ನೀವು ಉಪ್ಲೋಡ್ ಮಾಡುವ ಎಲ್ಲ ಮಾಹಿತಿ ಆಥಾವ ಬದಲಾವಣೆಗಳು ಓಪನ್ಸ್ಟ್ರೀಟ್ಮ್ಯಾಪ್ ಮಾಹಿತಿ ಉಪಯೋಗಿಸುವ ಎಲ್ಲ ನಕ್ಷೆಗಲ್ಲಿ ವ್ಯಕ್ತವಾಗುತ್ತದೆ. ",
-            "upload_explanation_with_user": "{ನಿಮ್ಮ ಹೆಸರಿನಿಲ್ಲಿ} ಉಪ್ಲೋಡ್ ಮಾಡುವ ಎಲ್ಲ ಮಾಹಿತಿ ಆಥಾವ ಬದಲಾವಣೆಗಳು ಓಪನ್ಸ್ಟ್ರೀಟ್ಮ್ಯಾಪ್ ಮಾಹಿತಿ ಉಪಯೋಗಿಸುವ ಎಲ್ಲ ನಕ್ಷೆಗಲ್ಲಿ ವ್ಯಕ್ತವಾಗುತ್ತದೆ. ",
+            "upload_explanation_with_user": "{user} ಉಪ್ಲೋಡ್ ಮಾಡುವ ಎಲ್ಲ ಮಾಹಿತಿ ಆಥಾವ ಬದಲಾವಣೆಗಳು ಓಪನ್ಸ್ಟ್ರೀಟ್ಮ್ಯಾಪ್ ಮಾಹಿತಿ ಉಪಯೋಗಿಸುವ ಎಲ್ಲ ನಕ್ಷೆಗಲ್ಲಿ ವ್ಯಕ್ತವಾಗುತ್ತದೆ. ",
             "save": "ಅಂತರಜಾಲಕ್ಕೆ ರವಾನೆ ಮಾಡು ",
             "cancel": "ರದ್ದು ಮಾಡು",
             "changes": "{count} ಬದಲಾವಣೆಗಳು",
@@ -339,7 +339,7 @@
             "modified": "ಮಾರ್ಪಡಿಸು",
             "deleted": "ಅಳಿಸಲಾಯಿತು",
             "created": "ರಚಿಸಲಾಯಿತು",
-            "about_changeset_comments": "‍‍‍ಚೇಂಜ್‌ಸೆಟ್ ಅಭಿಪ್ರಾಯದ ಬಗ್ಗೆ",
+            "about_changeset_comments": "ಬದಲಾವಣೆಗಳ ಸಾರಾಂಶದ ಬಗ್ಗೆ",
             "about_changeset_comments_link": "//wiki.openstreetmap.org/wiki/Good_changeset_comments\n\nಯಾವುದಾದರೂ ಬದಲಾದ ಗುಂಪಿಗೆ ನಿಮ್ಮ ಅಭಿಪ್ರಾಯ ತಿಳಿಸಬೇಕಾದಲ್ಲಿ ಈ ದಾಖಲೆ ನಿಮ್ಮ ಸಹಾಯಕ್ಕಿದೆ.  ",
             "google_warning": "ನೀವು ಈ ಹೇಳಿಕೆಯಲ್ಲಿ ಗೂಗಲ್ ಅನ್ನು ಉಲ್ಲೇಖಿಸಿದ್ದೀರ. ಗೂಗಲ್ ಮಾಪ್ಸ್ ನಿಂದ ಮಾಹಿತಿ ಪಡೆಯುವುದು ನಿಷೇಧಿಸಿದೆ. ",
             "google_warning_link": "http://www.openstreetmap.org/copyright\n\nಓಪನ್ಸ್ಟ್ರೀಟ್ಮ್ಯಾಪ್ ಕೃತಿಸ್ವಾಮ್ಯ ವಿವರಗಳ ಬಗ್ಗೆ ಮಾಹಿತಿ ಇಲ್ಲಿ ದೊರೆಯುತ್ತದೆ.  "
@@ -348,6 +348,25 @@
             "list": "ಸಂಪಾದನೆಗಳು {ಬಳಕೆದಾರ ಮೂಲಕ}",
             "truncated_list": "ಸಂಪಾದನೆಗಳು {users} ಮತ್ತು {count} ಇನ್ನಿತರೆ  "
         },
+        "info_panels": {
+            "key": "ಐ",
+            "background": {
+                "key": "B",
+                "title": "ಹಿನ್ನೆಲೆ",
+                "zoom": "ಜೂಮ್",
+                "vintage": "ವಿಂಟೇಜ್",
+                "unknown": "ಅಜ್ಞಾತ"
+            },
+            "history": {
+                "key": "H"
+            },
+            "location": {
+                "key": "L"
+            },
+            "measurement": {
+                "key": "M"
+            }
+        },
         "geometry": {
             "point": "ಬಿಂದು",
             "vertex": "ತುದಿ",
@@ -410,12 +429,13 @@
         "background": {
             "title": "ಹಿನ್ನೆಲೆ",
             "description": "ಹಿನ್ನಲೆ ವ್ಯವಸ್ತೆಗಳು",
+            "key": "B",
             "percent_brightness": "{opacity} % ಉಜ್ಜ್ವಲತೆ",
             "none": "‍‍ಯಾವುದೂ ಇಲ್ಲ",
             "best_imagery": "ಈ ಪ್ರದೇಶಕ್ಕೆ ಅಪ್ರತಿಮ ಉಪಗ್ರಹ ಚಿತ್ರಣ  ",
             "switch": "ಈ ಹಿನ್ನಲೆಗೆ ಹಿಂತಿರುಗಿ ",
             "custom": "ಅನುಸರಣ",
-            "custom_button": "ಅನುಸರಣ ಹಿನ್ನಲೆಯನ್ನು ಬದಲಿಸಿ  ",
+            "custom_button": "ಅನುಸರಣ ಹಿನ್ನಲೆಯನ್ನು ಸಂಪಾದಿಸಿ",
             "fix_misalignment": "ಉಪಗ್ರಹ ಚಿತ್ರಣ ಸರಿಹೊಂದಿಸುವುದು.",
             "imagery_source_faq": "‍ಈ ಉಪಗ್ರಹ ಚಿತ್ರಣ ಎಲ್ಲಿಂದ ದೊರೆತಿರುವುದು?",
             "reset": "ಮರುಹೊಂದಿಸು",
@@ -426,6 +446,7 @@
         "map_data": {
             "title": "ನಕ್ಷೆ ಮಾಹಿತಿ.",
             "description": "ನಕ್ಷೆ ಮಾಹಿತಿ.",
+            "key": "F",
             "data_layers": "ಡೇಟಾ ಪದರಗಳು",
             "fill_area": "ಪ್ರದೇಶಗಳನ್ನು ತುಂಬು",
             "map_features": "‍ನಕ್ಷೆಯ ವೈಶಿಷ್ಟ್ಯತೆಗಳು"
@@ -483,7 +504,8 @@
         "area_fill": {
             "wireframe": {
                 "description": "ತುಂಬುಇಲ್ಲ (ವಯರ್ಫ್ರೇಮ್)",
-                "tooltip": "ವಯರ್ಫ್ರೇಮ್ ಅಳವಡಿಸುವುದರಿಂದ ಹಿಂದಿನ ಸೆಟಿಲೈಟ್ ಚಿತ್ರ ಸ್ಪಷ್ಟವಾಗಿ ಕಾಣುತ್ತದೆ."
+                "tooltip": "ವಯರ್ಫ್ರೇಮ್ ಅಳವಡಿಸುವುದರಿಂದ ಹಿಂದಿನ ಸೆಟಿಲೈಟ್ ಚಿತ್ರ ಸ್ಪಷ್ಟವಾಗಿ ಕಾಣುತ್ತದೆ.",
+                "key": "W"
             },
             "partial": {
                 "description": "ಅರೆ ತುಂಬು‍"
@@ -530,7 +552,7 @@
         "splash": {
             "welcome": "ಓಪನ್ ಸ್ಟ್ರೀಟ್ ಮ್ಯಾಪ್ ಐಡಿ ಎಡಿಟರಿಗೆ ಸ್ವಾಗತ!",
             "walkthrough": "ಸಹಾಯದರ್ಶನವನ್ನು ಪ್ರಾರಂಭಿಸಿ  ",
-            "start": "ಬದಲಿಸಿ"
+            "start": "ಈಗ ಸಂಪಾದಿಸಿ"
         },
         "source_switch": {
             "live": "ಲೈವ್",
@@ -571,7 +593,8 @@
             "view_on_mapillary": "ಈ ಚಿತ್ರವನ್ನು Mapillary ನಲ್ಲಿ ನೋಡಿ"
         },
         "help": {
-            "title": "ಸಹಾಯ"
+            "title": "ಸಹಾಯ",
+            "key": "H"
         },
         "intro": {
             "done": "‍ಮುಗಿಯಿತು",
@@ -647,6 +670,47 @@
                 "start": "ನಕ್ಷೆ ಮಾಡಲು ಪ್ರಾರಂಭಿಸಿ!"
             }
         },
+        "shortcuts": {
+            "toggle": {
+                "key": "?"
+            },
+            "key": {
+                "alt": "Alt",
+                "backspace": "Backspace",
+                "cmd": "Cmd",
+                "ctrl": "Ctrl",
+                "delete": "Delete",
+                "del": "Del",
+                "end": "End",
+                "enter": "Enter",
+                "esc": "Esc",
+                "home": "Home",
+                "option": "Option",
+                "pause": "Pause",
+                "pgdn": "PgDn",
+                "pgup": "PgUp",
+                "return": "Return",
+                "shift": "Shift",
+                "space": "Space"
+            },
+            "browsing": {
+                "help": {
+                    "title": "ಸಹಾಯ"
+                }
+            },
+            "editing": {
+                "title": "ಸಂಪಾದಿಸುವುದು",
+                "commands": {
+                    "title": "ಆದೇಶಗಳು"
+                }
+            },
+            "tools": {
+                "title": "ಉಪಕರಣಗಳು",
+                "info": {
+                    "title": "ಮಾಹಿತಿ"
+                }
+            }
+        },
         "presets": {
             "categories": {
                 "category-barrier": {
@@ -747,9 +811,11 @@
                         "county": "ದೇಶ",
                         "county!jp": "ಜಿಲ್ಲೆ",
                         "district": "ಜಿಲ್ಲೆ",
+                        "floor": "ಮಹಡಿ",
                         "hamlet": "ಕೊಪ್ಪಲು",
                         "housename": "ಮನೆ ಹೆಸರು",
                         "housenumber": "೧೨೩",
+                        "housenumber!jp": "ಕಟ್ಟಡದ ಸಂಖ್ಯೆ",
                         "place": "ಸ್ಥಳ",
                         "postcode": "ಅಂಚೆ ಸಂಖ್ಯೆ",
                         "province": "ಪ್ರಾಂತ್ಯ",
@@ -805,6 +871,15 @@
                 "amenity": {
                     "label": "ವಿಧ"
                 },
+                "animal_boarding": {
+                    "label": "ಪ್ರಾಣಿಗಳಿಗಾಗಿ"
+                },
+                "animal_breeding": {
+                    "label": "ಪ್ರಾಣಿಗಳಿಗಾಗಿ"
+                },
+                "animal_shelter": {
+                    "label": "ಪ್ರಾಣಿಗಳಿಗಾಗಿ"
+                },
                 "area/highway": {
                     "label": "‍ವಿಧ"
                 },
@@ -850,6 +925,9 @@
                 "bunker_type": {
                     "label": "‍ವಿಧ"
                 },
+                "camera/direction": {
+                    "placeholder": "45, 90, 180, 270"
+                },
                 "capacity": {
                     "label": "ಸಾಮರ್ಥ್ಯ",
                     "placeholder": "50, 100, 200..."
@@ -888,8 +966,8 @@
                 "construction": {
                     "label": "ವಿಧ"
                 },
-                "content": {
-                    "label": "‍ ಒಳಾಂಶಗಳು"
+                "contact/webcam": {
+                    "placeholder": "http://example.com/"
                 },
                 "country": {
                     "label": "ದೇಶ"
@@ -951,6 +1029,10 @@
                 "elevation": {
                     "label": "ಎತ್ತರ"
                 },
+                "email": {
+                    "label": "ಮಿಂಚಂಚೆ",
+                    "placeholder": "example@example.com"
+                },
                 "emergency": {
                     "label": "ತುರ್ತು"
                 },
@@ -967,6 +1049,11 @@
                 "fee": {
                     "label": "ಶುಲ್ಕ"
                 },
+                "fire_hydrant/position": {
+                    "options": {
+                        "green": "ಹಸಿರು"
+                    }
+                },
                 "fire_hydrant/type": {
                     "label": "ವಿಧ",
                     "options": {
@@ -1122,6 +1209,9 @@
                 "man_made": {
                     "label": "ವಿಧ"
                 },
+                "maxheight": {
+                    "placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\""
+                },
                 "maxspeed": {
                     "label": "ವೇಗ ಮಿತಿ",
                     "placeholder": "40, 50, 60..."
@@ -1157,6 +1247,12 @@
                 "network": {
                     "label": "ಜಾಲಬಂಧ"
                 },
+                "network_bicycle": {
+                    "options": {
+                        "ncn": "ರಾಷ್ಟ್ರೀಯ",
+                        "rcn": "ಸ್ಥಳೀಯ"
+                    }
+                },
                 "network_foot": {
                     "options": {
                         "iwn": "ಅಂತರಾಷ್ಟ್ರೀಯ",
@@ -1289,6 +1385,12 @@
                 "seasonal": {
                     "label": "ಋತುಮಾನ"
                 },
+                "second_hand": {
+                    "options": {
+                        "no": "ಇಲ್ಲ",
+                        "yes": "ಹೌದು"
+                    }
+                },
                 "service": {
                     "label": "ವಿಧ"
                 },
diff --git a/dist/locales/ko.json b/dist/locales/ko.json
index a5228e4cb..8ddacf528 100644
--- a/dist/locales/ko.json
+++ b/dist/locales/ko.json
@@ -348,6 +348,23 @@
             "list": "{users} 사용자의 편집",
             "truncated_list": "{users} 사용자와 다른 {count}명의 편집"
         },
+        "info_panels": {
+            "key": "I",
+            "background": {
+                "key": "B",
+                "title": "배경",
+                "zoom": "확대",
+                "unknown": "알 수 없음",
+                "show_tiles": "타일 나타내기",
+                "hide_tiles": "타일 숨기기"
+            },
+            "history": {
+                "key": "H",
+                "selected": "{n}개 선택함",
+                "version": "버전",
+                "last_edit": "최근 편집"
+            }
+        },
         "geometry": {
             "point": "점",
             "vertex": "꼭지점",
@@ -641,10 +658,13 @@
                 "countrycode": "kr",
                 "name": {
                     "main-street": "중앙로",
+                    "pizza-hut": "피자헛",
                     "three-rivers-city-hall": "삼천시청",
                     "three-rivers-elementary-school": "삼천초등학교",
+                    "three-rivers-fire-department": "삼천소방서",
                     "three-rivers-high-school": "삼천고등학교",
                     "three-rivers-middle-school": "삼천중학교",
+                    "three-rivers-municipal-airport": "삼천공항",
                     "three-rivers-post-office": "삼천우체국",
                     "three-rivers-public-library": "삼천도서관"
                 }
@@ -698,13 +718,16 @@
                 "choose_category_road": "**목록에서 {category}을 선택하세요.**",
                 "choose_preset_residential": "여기에 도로의 여러 종류가 있지만, 지금 선택된 것은 주거 도로입니다. **{preset} 유형을 선택하세요**",
                 "retry_preset_residential": "{preset} 유형을 선택하지 않았습니다. **다시 선택하려면 여기를 클릭하세요**",
+                "split_intersection": "**{button} 버튼을 눌러 {street}을(를) 분할하세요.**",
                 "retry_split": "Split 버튼을 클릭하지 않았습니다. 다시 시도하세요.",
+                "multi_delete": "**{button} 버튼을 눌러 여분의 줄을 삭제하세요.**",
                 "retry_delete": "Delete 버튼을 클릭하지 않았습니다. 다시 시도하세요."
             },
             "buildings": {
                 "title": "건물",
                 "retry_building": "건물 모서리에 교점을 설치하는 데 문제가 있는것 같습니다. 다시해보십시요!",
                 "choose_category_building": "**목록에서 {category}을 선택하세요.**",
+                "rightclick_building": "**마우스 오른쪽 버튼을 눌러 당신이 만든 빌딩을 선택하고 편집 메뉴를 표시하세요.**",
                 "retry_square": "Square 버튼을 클릭하지 않았습니다. 다시 시도하세요.",
                 "search_tank": "**'{preset}'을 검색하세요.**",
                 "choose_tank": "**목록에서 {preset}을 선택하세요.**"
@@ -718,6 +741,9 @@
         "shortcuts": {
             "title": "키보드 단축키",
             "tooltip": "화면에 키보드 단축키를 보여줍니다.",
+            "toggle": {
+                "key": "?"
+            },
             "key": {
                 "alt": "Alt",
                 "backspace": "Backspace",
@@ -731,6 +757,7 @@
                 "home": "Home",
                 "option": "Option",
                 "pause": "Pause",
+                "pgdn": "PgDn",
                 "pgup": "Pgup",
                 "return": "Return",
                 "shift": "Shift",
@@ -1112,9 +1139,6 @@
                     "label": "웹캠 URL",
                     "placeholder": "http://example.com/"
                 },
-                "content": {
-                    "label": "내용"
-                },
                 "country": {
                     "label": "국가"
                 },
@@ -4615,6 +4639,51 @@
                 "attribution": {
                     "text": "© Sarah Hoffmann, CC by-SA 3.0, 맵 데이터 OpenStreetMap 기여자, ODbL 1.0"
                 }
+            },
+            "Waymarked_Trails-Hiking": {
+                "attribution": {
+                    "text": "© Sarah Hoffmann, CC by-SA 3.0, 맵 데이터 OpenStreetMap 기여자, ODbL 1.0"
+                }
+            },
+            "Waymarked_Trails-MTB": {
+                "attribution": {
+                    "text": "© Sarah Hoffmann, CC by-SA 3.0, 맵 데이터 OpenStreetMap 기여자, ODbL 1.0"
+                }
+            },
+            "Waymarked_Trails-Skating": {
+                "attribution": {
+                    "text": "© Sarah Hoffmann, CC by-SA 3.0, 맵 데이터 OpenStreetMap 기여자, ODbL 1.0"
+                }
+            },
+            "Waymarked_Trails-Winter_Sports": {
+                "attribution": {
+                    "text": "© Michael Spreng, CC by-SA 3.0, 맵 데이터 OpenStreetMap 기여자, ODbL 1.0"
+                }
+            },
+            "hike_n_bike": {
+                "attribution": {
+                    "text": "© OpenStreetMap 기여자"
+                }
+            },
+            "openpt_map": {
+                "attribution": {
+                    "text": "© OpenStreetMap 기여자, CC-BY-SA"
+                }
+            },
+            "osm-gps": {
+                "attribution": {
+                    "text": "© OpenStreetMap 기여자"
+                }
+            },
+            "osm-mapnik-black_and_white": {
+                "attribution": {
+                    "text": "© OpenStreetMap 기여자, CC-BY-SA"
+                }
+            },
+            "osm-mapnik-german_style": {
+                "attribution": {
+                    "text": "© OpenStreetMap 기여자, CC-BY-SA"
+                }
             }
         }
     }
diff --git a/dist/locales/lt.json b/dist/locales/lt.json
index 1c76c311d..a8eba5503 100644
--- a/dist/locales/lt.json
+++ b/dist/locales/lt.json
@@ -966,9 +966,6 @@
                 "contact/webcam": {
                     "placeholder": "http://pavyzdys.lt/"
                 },
-                "content": {
-                    "label": "Turinys"
-                },
                 "country": {
                     "label": "Šalis"
                 },
diff --git a/dist/locales/mk.json b/dist/locales/mk.json
index f81dbe090..50f4b24d2 100644
--- a/dist/locales/mk.json
+++ b/dist/locales/mk.json
@@ -805,9 +805,6 @@
                     "label": "URL на семрежната камера",
                     "placeholder": "http://example.com/"
                 },
-                "content": {
-                    "label": "Содржина"
-                },
                 "country": {
                     "label": "Земја"
                 },
diff --git a/dist/locales/nl.json b/dist/locales/nl.json
index b86bbdcf4..8c887d137 100644
--- a/dist/locales/nl.json
+++ b/dist/locales/nl.json
@@ -1289,9 +1289,6 @@
                     "label": "Webcam-URL",
                     "placeholder": "http://example.com/"
                 },
-                "content": {
-                    "label": "Inhoud"
-                },
                 "country": {
                     "label": "Land"
                 },
diff --git a/dist/locales/no.json b/dist/locales/no.json
index 78ef38bed..6f84c5f1d 100644
--- a/dist/locales/no.json
+++ b/dist/locales/no.json
@@ -820,9 +820,6 @@
                 "construction": {
                     "label": "Type"
                 },
-                "content": {
-                    "label": "Innhold"
-                },
                 "country": {
                     "label": "Land"
                 },
diff --git a/dist/locales/pl.json b/dist/locales/pl.json
index 79c4d8d5e..9ae6a1671 100644
--- a/dist/locales/pl.json
+++ b/dist/locales/pl.json
@@ -1357,9 +1357,6 @@
                     "label": "Adres kamery internetowej",
                     "placeholder": "http://example.com"
                 },
-                "content": {
-                    "label": "Zawartość"
-                },
                 "country": {
                     "label": "Kraj"
                 },
@@ -1447,7 +1444,7 @@
                     "label": "Typ"
                 },
                 "drive_through": {
-                    "label": "Drive-Through"
+                    "label": "Drive-Through (zakupy)"
                 },
                 "electrified": {
                     "label": "Elektryfikacja",
@@ -2150,7 +2147,7 @@
                         "grade2": "Żwirowa/tłuczniowa z niewielką domieszką piasku, mułu lub gliny",
                         "grade3": "Składająca się z równej ilości twardych i miękkich materiałów",
                         "grade4": "Ziemia/piasek/trawa z domieszką twardych materiałów",
-                        "grade5": "Ziemia/piasek/trawa, bez dodatku materiałów utwardzonych; często słabo widoczna"
+                        "grade5": "Ziemia/piasek/trawa, bez dodatku materiałów twardych; często słabo widoczna"
                     },
                     "placeholder": "Utwardzona, nieubita..."
                 },
@@ -3329,8 +3326,8 @@
                     "terms": "ustąp pierwszeństwa przejazdu"
                 },
                 "highway/living_street": {
-                    "name": "Droga w oznaczonej strefie zamieszkania",
-                    "terms": "strefa,zamieszkania,zamieszkała,droga,ulica"
+                    "name": "Droga w oznaczonej znakami D-40/D-41 strefie zamieszkania",
+                    "terms": "strefa zamieszkania"
                 },
                 "highway/mini_roundabout": {
                     "name": "Mini-rondo",
@@ -3397,7 +3394,7 @@
                     "terms": "alejka"
                 },
                 "highway/service/drive-through": {
-                    "name": "Drive-Through",
+                    "name": "Drive-Through (zakupy)",
                     "terms": "drive-through"
                 },
                 "highway/service/driveway": {
diff --git a/dist/locales/pt-BR.json b/dist/locales/pt-BR.json
index a09b17739..bf0f32e18 100644
--- a/dist/locales/pt-BR.json
+++ b/dist/locales/pt-BR.json
@@ -893,7 +893,9 @@
             "browsing": {
                 "title": "Navegar",
                 "navigation": {
-                    "title": "Navegação"
+                    "title": "Navegação",
+                    "zoom": "Aumentar/Diminuir ",
+                    "zoom_more": "Aumentar/Diminuir Bastante"
                 },
                 "help": {
                     "title": "Ajuda",
@@ -904,13 +906,31 @@
                     "title": "Mostrar opções",
                     "background": "Mostrar opções de imagem de fundo",
                     "background_switch": "Voltar para a última imagem de fundo",
+                    "map_data": "Mostre as opções dos dados do mapa",
                     "fullscreen": "Entrar no modo de tela cheia"
+                },
+                "selecting": {
+                    "title": "Selecione um recurso",
+                    "select_one": "Selecione apenas um recurso",
+                    "select_multi": "Selecione multiplos recursos"
+                },
+                "with_selected": {
+                    "title": "Com o recurso selecionado"
+                },
+                "vertex_selected": {
+                    "previous": "Pule para o nó anterior ",
+                    "next": "Pule para o próximo nó",
+                    "first": "Pule para o primeiro nó",
+                    "last": "Pule para o ultimo nó"
                 }
             },
             "editing": {
                 "title": "Editar",
                 "drawing": {
-                    "title": "Desenhar"
+                    "title": "Desenhar",
+                    "add_point": "modo 'Adicionar ponto' ",
+                    "add_line": "modo 'Adicionar linha'",
+                    "add_area": "modo 'Adicionar area'"
                 },
                 "operations": {
                     "title": "Operações",
@@ -922,6 +942,9 @@
                     "redo": "Refazer última ação",
                     "save": "Salvar alterações"
                 }
+            },
+            "tools": {
+                "title": "Ferramentas"
             }
         },
         "presets": {
@@ -1244,9 +1267,6 @@
                     "label": "URL da Webcam",
                     "placeholder": "http://exemplo.com.br/"
                 },
-                "content": {
-                    "label": "Conteúdo"
-                },
                 "country": {
                     "label": "País"
                 },
diff --git a/dist/locales/pt.json b/dist/locales/pt.json
index f7492409b..d03131647 100644
--- a/dist/locales/pt.json
+++ b/dist/locales/pt.json
@@ -348,6 +348,49 @@
             "list": "Edições de {users}",
             "truncated_list": "Edições feitas por {users} e outros {count} utilizadores"
         },
+        "info_panels": {
+            "key": "I",
+            "background": {
+                "key": "B",
+                "title": "Fundo",
+                "zoom": "Aproximar",
+                "vintage": "Vintage",
+                "unknown": "Desconhecido",
+                "show_tiles": "Mostrar rmoisaco",
+                "hide_tiles": "Ocultar moisaco"
+            },
+            "history": {
+                "key": "H",
+                "title": "Histórico",
+                "selected": "(n) selecionados",
+                "version": "Versão",
+                "last_edit": "Última edição",
+                "edited_by": "Editado por",
+                "changeset": "Conjunto de alterações",
+                "unknown": "Desconhecidos",
+                "link_text": "Histórico em openstreetmap.org"
+            },
+            "location": {
+                "key": "L",
+                "title": "Localização",
+                "unknown_location": "Localização desconhecida"
+            },
+            "measurement": {
+                "key": "M",
+                "title": "Medição",
+                "selected": "(n) selecionados",
+                "geometry": "Geometria",
+                "closed": "Fechado",
+                "center": "Centro",
+                "perimeter": "Perímetro ",
+                "length": "Comprimento",
+                "area": "Área",
+                "centroid": "Centróide",
+                "location": "Localização",
+                "metric": "Métrico",
+                "imperial": "Imperial"
+            }
+        },
         "geometry": {
             "point": "ponto",
             "vertex": "vértice",
@@ -410,24 +453,28 @@
         "background": {
             "title": "Imagem de Fundo",
             "description": "Configurar imagem de fundo",
+            "key": "B",
             "percent_brightness": "{opacity}% transparente",
             "none": "Nenhum",
             "best_imagery": "Melhor fonte de imagem para esse lugar",
             "switch": "Mudar para este fundo",
             "custom": "Personalizado",
             "custom_button": "Editar fundo personalizando",
+            "custom_prompt": "Submeta um modelo de moisaco via. Tokens válidos: - {zoom}/{z}, {x}, {y} para Z/X/Y esquema de moisaco - {ty} for flipped TMS-style Y coordinates - {u} for quadtile scheme - {switch:a,b,c} for DNS server multiplexingExample:{example}",
             "fix_misalignment": "Corrigir o alinhamento da imagem",
             "imagery_source_faq": "Qual é a origem desta imagem?",
             "reset": "reiniciar",
             "offset": "Arrasta para a área cinzenta abaixo para corrigir o alinhamento da imagem, ou insira os valores de deslocamento em metros. ",
             "minimap": {
                 "description": "Mini-mapa",
-                "tooltip": "Mostra um pequeno mapa com uma área mais abrangente que ajuda a localizar a área que está a editar."
+                "tooltip": "Mostra um pequeno mapa com uma área mais abrangente que ajuda a localizar a área que está a editar.",
+                "key": "/"
             }
         },
         "map_data": {
             "title": "Dados do Mapa",
             "description": "Dados do Mapa",
+            "key": "F",
             "data_layers": "Camadas de Dados",
             "fill_area": "Preenchimento de Áreas",
             "map_features": "Elementos do Mapa",
@@ -486,7 +533,8 @@
         "area_fill": {
             "wireframe": {
                 "description": "Sem Preenchimento (só linhas)",
-                "tooltip": "Ativar o modo 'só linhas' permite ver melhor a imagem de fundo."
+                "tooltip": "Ativar o modo 'só linhas' permite ver melhor a imagem de fundo.",
+                "key": "W"
             },
             "partial": {
                 "description": "Preenchimento Parcial",
@@ -499,7 +547,9 @@
         },
         "restore": {
             "heading": "Tem alterações por gravar",
-            "description": "Tem alterações feitas numa sessão anterior por gravar. Quer recuperar essas alterações?"
+            "description": "Tem alterações feitas numa sessão anterior por gravar. Quer recuperar essas alterações?",
+            "restore": "Restaurar as minhas alterações",
+            "reset": "Desfazer as minhas alterações"
         },
         "save": {
             "title": "Gravar",
@@ -570,6 +620,8 @@
         "validations": {
             "disconnected_highway": "Rodovia desligada",
             "disconnected_highway_tooltip": "As estradas devem estar ligadas a outras estradas ou entradas de edifícios.",
+            "old_multipolygon": "Tags de multi-polígono na parte exterior ",
+            "old_multipolygon_tooltip": "Este tipo de multi-polígono está fore de uso. Por favor ajuste as tags ao multi-polígono principal em vez de colocar na parte exterior ",
             "untagged_point": "Ponto sem etiquetas",
             "untagged_point_tooltip": "Escolha um elemento que indique o que este ponto representa.",
             "untagged_line": "Linha sem etiquetas",
@@ -607,6 +659,7 @@
         },
         "help": {
             "title": "Ajuda",
+            "key": "H",
             "help": "#Ajuda\n\nEstá a usar um editor do [OpenStreetMap](http://www.openstreetmap.org/), o mapa mundial livre e editável.\nPode usá-lo para adicionar e atualizar dados da sua área, tornando-o num mapa de código e dados abertos mundial melhor para todos.\n\nAs alterações que fizer neste mapa serão visíveis para qualquer pessoa que\ndecida usar o OpenStreetMap. Para fazer uma edição, basta\n[iniciar sessão](https://www.openstreetmap.org/login).\n\nO [editor iD](http://ideditor.com/) é um projeto colaborativo com o [código-fonte disponível no GitHub](https://github.com/openstreetmap/iD).\n",
             "roads": "# Estradas\n\nPode criar, corrigir e eliminar estradas com o editor. As estradas podem ser\nde qualquer tipo: caminhos, autoestradas, carreiros florestais ou agrícolas,\nruas pedonais, ciclovias, entre outras. Qualquer local que seja frequentemente\natravessado por pessoas deve ser normalmente colocado no mapa.\n\n### Selecionar\n\nClique numa estrada para a selecionar. Aparece o painel lateral direito para\npoder editar as caraterísticas da estrada e botões em redor da estrada.\n\n### Alterar\n\nClique na estrada que quer alterar. Se quiser adicionar pontos à estrada entre\ndois pontos existentes basta clicar 2 vezes sobre o segmento da estrada.\nPode então deslocar esse ponto acabado de criar.\n\nSe existir uma estrada com ligação a outra no terreno mas que no mapa não\nestão ligadas, basta deslocar um ponto de uma das estradas até à outra estrada\npara ficarem ligadas. É muito importante as estradas estarem corretamente\nligadas umas às outras para que os programas de rotas possam fornecer\ninformações corretas aos utilizadores.\n\nPode também clicar no botão de 'Mover' ou premir a tecla 'M' para mover\na estrada toda de uma só vez. No entanto deve-se ter cuidado ao fazer isso\npois todos os pontos da estrada, incluindo os pontos partilhados com\noutras estradas, serão movidos.\n\nPara dividir uma estrada em duas, útil por exemplo quando existe uma estrada\nno mapa que na realidade são 2 estradas diferentes com nomes diferentes,\nclique no ponto da estrada onde quer dividir e clique no botão da tesoura que\naparece ao lado do ponto. Esse botão aparece apenas se estiver selecionado o ponto e não a linha. Pode também combinar as 2 linhas numa só\nselecionando as duas estradas e clicando no botão + que aparece ao lado.\nSe existirem no mapa 2 estradas ligadas (nas extremidades ou num cruzamento)\nmas que na realidade não se ligam ou cruzam, basta selecionar o ponto comum\ne clicar no botão ao lado de desligar as linhas. Pode então deslocar o ponto\npara outro local.\n\n### Eliminar\n\nSe uma estrada estiver errada - pode-se confirmar pela imagem de satélite (ter em\nconta que a imagem de satélite pode ter alguns anos e a estrada pode ter sido\nconstruida posteriormente) e preferencialmente confirmar presencialmente  - pode\neliminar a estrada toda. É necessária precaução ao eliminar elementos do mapa.\nTal como qualquer outra alteração, os resultados serão visíveis a todos os outros.\n\nPode eliminar uma estrada clicando nela para a selecionar e de seguida\nclicar no ícone do caixote do lixo que aparece ao lado, ou simplesmente\npressionar na tecla 'Del' do teclado.\n\n### Criar\n\nEncontrou alguma estrada que não existe no mapa? Clique no botão 'Linha' que\nestá na parte superior ou pressione a tecla '2' para começar a desenhar a linha.\n\nClique no ponto inicial da estrada para começar a desenhá-la. Se já existir\numa estrada no mapa, mas que está incompleta, pode continuá-la bastando\npara isso clicar no ponto da extremidade da estrada existente e clicar no botão em redor 'Continuar esta linha'.\n\nAdicione então outros pontos de acordo com as imagens de satélite ou os trilhos\nGPS. Se a estrada que está a desenhar cruzar com outra estrada, crie um ponto\npor cima da outra estrada onde se cruzam. Quando terminar de desenhar\na estrada, clique duas vezes no último ponto da estrada ou pressione a tecla 'Enter' (mudança d linha).\n",
             "gps": "# GPS\n\nOs dados de GPS são a fonte mais fidedigna de dados no OpenStreetMap. Este editor suporta trilhos GPS locais - ficheiros `.gpx` que estejam no seu computador. Pode obter este tipo de trilhos GPS através de várias aplicações existentes para telemóveis assim como dispositivos GPS.\n\nPara mais informações sobre a obtenção de trilhos GPS, ver [Surveying with a GPS](http://learnosm.org/en/mobile-mapping/).\n\nPara usar um trilho GPX no editor para mapear, arraste o ficheiro GPX do seu computador para a janela do editor com o mapa. Se o ficheiro for reconhecido com sucesso, o trilho será adicionado ao mapa, aparecendo como uma linha de cor roxa. Clique no botão 'Dados do Mapa' à direita para ativar, desativar ou enquadrar nesta nova camada onde se situa o trilho GPX.\n\nO trilho GPX não é enviado diretamente para o OpenStreetMap - apenas pode servir de referência para si, por forma a desenhar com mais precisão elementos no mapa.\n\nTambém pode [enviar os seus trilhos GPS](http://www.openstreetmap.org/trace/create) para o OpenStreetMap para que possam ser úteis a outros utilizadores que editem o mapa.\n",
@@ -634,10 +687,12 @@
                 "countrycode": "pt"
             },
             "welcome": {
-                "welcome": "bem vindo! Este tutorial irá ensiná-lo o básico de como editar no OpenStreetMap "
+                "welcome": "bem vindo! Este tutorial irá ensiná-lo o básico de como editar no OpenStreetMap ",
+                "practice": "Toda a informação contida neste guia, é a apenas para praticar e qualquer alteração que faça durante este guia, não serão guardadas."
             },
             "navigation": {
-                "title": "Navegação"
+                "title": "Navegação",
+                "points_lines_areas": "Os elementos do mapa são representados em *pontos, linhas ou áreas.*"
             },
             "points": {
                 "title": "Pontos"
@@ -974,9 +1029,6 @@
                     "label": "URL da webcam",
                     "placeholder": "http://example.com/"
                 },
-                "content": {
-                    "label": "Conteúdos"
-                },
                 "country": {
                     "label": "País"
                 },
@@ -1224,6 +1276,9 @@
                 "kerb": {
                     "label": "Lancil"
                 },
+                "label": {
+                    "label": "Rótulo"
+                },
                 "lamp_type": {
                     "label": "Tipo"
                 },
@@ -4778,45 +4833,107 @@
             "OSM_Inspector-Addresses": {
                 "attribution": {
                     "text": "© Geofabrik GmbH, contribuidores OpenStreetMap, CC-BY-SA"
-                }
+                },
+                "name": "Inspector OSM: Moradas"
             },
             "OSM_Inspector-Geometry": {
                 "attribution": {
                     "text": "© Geofabrik GmbH, contribuidores OpenStreetMap, CC-BY-SA"
-                }
+                },
+                "name": "Inspector OSM: Geometria"
             },
             "OSM_Inspector-Highways": {
                 "attribution": {
                     "text": "© Geofabrik GmbH, contribuidores OpenStreetMap, CC-BY-SA"
-                }
+                },
+                "name": "Inspector OSM: Estradas"
             },
             "OSM_Inspector-Multipolygon": {
                 "attribution": {
                     "text": "© Geofabrik GmbH, contribuidores OpenStreetMap, CC-BY-SA"
-                }
+                },
+                "name": "Inspector OSM: Áreas"
             },
             "OSM_Inspector-Places": {
                 "attribution": {
                     "text": "© Geofabrik GmbH, contribuidores OpenStreetMap, CC-BY-SA"
-                }
+                },
+                "name": "Inspector OSM: Lugares"
             },
             "OSM_Inspector-Routing": {
                 "attribution": {
                     "text": "© Geofabrik GmbH, contribuidores OpenStreetMap, CC-BY-SA"
-                }
+                },
+                "name": "Inspector OSM: Rotas"
             },
             "OSM_Inspector-Tagging": {
                 "attribution": {
                     "text": "© Geofabrik GmbH, contribuidores OpenStreetMap, CC-BY-SA"
-                }
+                },
+                "name": "Inspector OSM: Etiquetagem"
+            },
+            "Waymarked_Trails-Cycling": {
+                "attribution": {
+                    "text": "© Sarah Hoffmann, CC by-SA 3.0, conteúdo do mapa contribuidores OpenStreetMap, ODbL 1.0"
+                },
+                "name": "Waymarked Trails: Ciclismo"
+            },
+            "Waymarked_Trails-Hiking": {
+                "attribution": {
+                    "text": "© Sarah Hoffmann, CC by-SA 3.0, conteúdo do mapa contribuidores OpenStreetMap, ODbL 1.0"
+                },
+                "name": "Waymarked Trails: Pedestrianismo"
+            },
+            "Waymarked_Trails-MTB": {
+                "attribution": {
+                    "text": "© Sarah Hoffmann, CC by-SA 3.0, conteúdo do mapa contribuidores OpenStreetMap, ODbL 1.0"
+                },
+                "name": "Waymarked Trails: Ciclismo de montanha"
+            },
+            "Waymarked_Trails-Skating": {
+                "attribution": {
+                    "text": "© Sarah Hoffmann, CC by-SA 3.0, conteúdo do mapa contribuidores OpenStreetMap, ODbL 1.0"
+                },
+                "name": "Waymarked Trails: Skate"
+            },
+            "Waymarked_Trails-Winter_Sports": {
+                "attribution": {
+                    "text": "© Sarah Hoffmann, CC by-SA 3.0, conteúdo do mapa contribuidores OpenStreetMap, ODbL 1.0"
+                },
+                "name": "Waymarked Trails: Desportos de Inverno"
+            },
+            "basemap.at": {
+                "attribution": {
+                    "text": "basemap.at"
+                },
+                "description": "Mapa base Áustria, baseado em informação govenamental ",
+                "name": "basemap.at"
+            },
+            "basemap.at-orthofoto": {
+                "attribution": {
+                    "text": "basemap.at"
+                },
+                "description": "Ortofotomapa fornecido por basemap.at. Sucessor de geoimage.at imagery.",
+                "name": "Ortofotomapa geoimage.at"
             },
             "hike_n_bike": {
+                "attribution": {
+                    "text": "Contribuidores © OpenStreetMap"
+                },
                 "name": "Bicicleta & caminhadas"
             },
             "mapbox_locator_overlay": {
                 "attribution": {
                     "text": "Termos e opinião"
-                }
+                },
+                "description": "Mostras as principais funcionalidades para ajudar a orientá-lo.",
+                "name": "Sobreposição de localização"
+            },
+            "openpt_map": {
+                "attribution": {
+                    "text": "Contribuidores © OpenStreetMap, CC-BY-SA"
+                },
+                "name": "OpenPT Map (sobreposição)"
             },
             "osm-gps": {
                 "attribution": {
@@ -4836,6 +4953,36 @@
                     "text": "© contribuidores OpenStreetMap, CC-BY-SA"
                 },
                 "name": "OpenStreetMap (estilo alemão)"
+            },
+            "qa_no_address": {
+                "attribution": {
+                    "text": "Simon Poole, dados contribuidores © OpenStreetMap"
+                },
+                "name": "QA Sem morada"
+            },
+            "skobbler": {
+                "attribution": {
+                    "text": "© moisaco: skobbler, dados do mapa contribuidores © OpenStreetMap"
+                },
+                "name": "skobbler"
+            },
+            "stamen-terrain-background": {
+                "attribution": {
+                    "text": "moisaco do mapa por Stamen Design, sob licença CC BY 3.0"
+                },
+                "name": "Terreno Stamen"
+            },
+            "tf-cycle": {
+                "attribution": {
+                    "text": "Mapa © Thunderforest, dados do mapa contribuidores © OpenStreetMap"
+                },
+                "name": "Thunderforest OpenCycleMap"
+            },
+            "tf-landscape": {
+                "attribution": {
+                    "text": "Mapa © Thunderforest, dados do mapa contribuidores © OpenStreetMap"
+                },
+                "name": "Thunderforest Landscape"
             }
         }
     }
diff --git a/dist/locales/ru.json b/dist/locales/ru.json
index 48182f345..231f4b628 100644
--- a/dist/locales/ru.json
+++ b/dist/locales/ru.json
@@ -4,7 +4,7 @@
             "add_area": {
                 "title": "Область",
                 "description": "Нанести на карту парки, здания, озёра и другие площадные объекты.",
-                "tail": "Щёлкните по карте, чтобы начать рисовать область: парк, озеро, здания и т.п."
+                "tail": "Щёлкните по карте, чтобы начать рисовать область: парк, озеро, здание и т. п."
             },
             "add_line": {
                 "title": "Линия",
@@ -504,7 +504,9 @@
         },
         "restore": {
             "heading": "У вас есть несохранённые правки",
-            "description": "Имеются несохранённые правки с прошлого сеанса. Восстановить их?"
+            "description": "Имеются несохранённые правки с прошлого сеанса. Восстановить их?",
+            "restore": "Восстановить мои правки",
+            "reset": "Отменить мои правки"
         },
         "save": {
             "title": "Сохранить",
@@ -794,6 +796,8 @@
                 "title": "Области",
                 "add_playground": "*Области* используются для обозначения таких объектов, как реки, здания и жилые сектора.{br}Их также можно применять для более детального отображения объектов, которые обычно указываются точками. **Нажмите кнопку полигона {button} для создания новой области.**",
                 "start_playground": "Давайте добавим игровую площадку на карту в виде области. Область рисуется размещением точек по периметру объекта. **Щелкните мышью или нажмите пробел для размещения первой точки на одном из углов площадки.**",
+                "continue_playground": "Продолжайте обводить область, размещая узлы вдоль краёв детской площадки. Будет отлично, если вы присоедините область к уже нарисованным дорожкам.{br}Совет: вы можете держать клавишу '{alt}', чтобы предотвратить привязку к другим элементам. **Продолжайте обводить область детской площадки.**",
+                "finish_playground": "Завершите обводку, нажав enter или щёлкнув на первом или последнем узле. **Завершите обводку области детской площадки.**",
                 "search_playground": "**Искать '{preset}'.**",
                 "choose_playground": "**Выберите {preset} из списка.**",
                 "add_field": "Эта детская площадка не имеет официального названия, поэтому мы не будем добавлять ничего в поле Название.{br}Вместо этого давайте добавим больше подробностей об этой детской площадке в поле Описание. **Откройте список «Добавить поле».**",
@@ -810,6 +814,7 @@
                 "choose_category_road": "**Выберите {category} из списка.**",
                 "choose_preset_residential": "Существует много различных типов дорог, но в данном случае это дорога вдоль жилых зон. **Выберите тип дороги «{preset}»**",
                 "retry_preset_residential": "Вы не выбрали тип  {preset}. **Щёлкните здесь, чтобы выбрать заново.**",
+                "name_road": "**Дайте этой дороге название, затем нажмите escape, enter или щёлкните {button} кнопку, чтобы закрыть редактор свойств.**",
                 "did_name_road": "Замечательно! Теперь мы изучим как изменить форму линии.",
                 "update_line": "Иногда вам потребуется изменить форму существующей линии. Вот эта дорога явно выглядит не совсем правильно.",
                 "finish_drag_endpoint": "Вот неплохое место. **Отпустите левую кнопку мыши чтобы завершить перемещение.**",
@@ -1196,9 +1201,6 @@
                     "label": "Адрес камеры",
                     "placeholder": "http://example.com/"
                 },
-                "content": {
-                    "label": "Содержимое"
-                },
                 "country": {
                     "label": "Страна"
                 },
diff --git a/dist/locales/sk.json b/dist/locales/sk.json
index 1de62f9ed..4b4e47e62 100644
--- a/dist/locales/sk.json
+++ b/dist/locales/sk.json
@@ -259,10 +259,10 @@
                 }
             },
             "reverse": {
-                "title": "Obrátiť",
+                "title": "Obrátiť smer",
                 "description": "Obrátiť smer čiary na opačnú stranu.",
                 "key": "V",
-                "annotation": "Obrátenie čiary."
+                "annotation": "Obrátenie smeru čiary."
             },
             "split": {
                 "title": "Rozdeliť",
@@ -334,7 +334,7 @@
             "upload_explanation_with_user": "Zmeny, ktoré nahráte ako {user}, budú viditeľné na všetkých mapách, ktoré používajú údaje z OpenStreetMap.",
             "save": "Nahrať",
             "cancel": "Zrušiť",
-            "changes": "Počet zmien: {count}",
+            "changes": "{count} Zmien",
             "warnings": "Upozornenia",
             "modified": "Upravené",
             "deleted": "Odstránené",
@@ -348,6 +348,49 @@
             "list": "Úpravy od {users}",
             "truncated_list": "Úpravy od {users} a {count} ďalších"
         },
+        "info_panels": {
+            "key": "I",
+            "background": {
+                "key": "B",
+                "title": "Pozadie",
+                "zoom": "Priblíženie",
+                "vintage": "Archívne",
+                "unknown": "Neznáme",
+                "show_tiles": "Zobraziť dlaždice",
+                "hide_tiles": "Skryť dlaždice"
+            },
+            "history": {
+                "key": "H",
+                "title": "História",
+                "selected": "{n} vybraných",
+                "version": "Verzia",
+                "last_edit": "Posledná úprava",
+                "edited_by": "Upravené od",
+                "changeset": "Súbor zmien",
+                "unknown": "Neznáme",
+                "link_text": "História na openstreetmap.org"
+            },
+            "location": {
+                "key": "L",
+                "title": "Poloha",
+                "unknown_location": "Neznáma poloha"
+            },
+            "measurement": {
+                "key": "M",
+                "title": "Merania",
+                "selected": "{n} vybraných",
+                "geometry": "Geometria",
+                "closed": "uzavretá",
+                "center": "Stred",
+                "perimeter": "Obvod",
+                "length": "Dĺžka",
+                "area": "Plocha",
+                "centroid": "Ťažisko",
+                "location": "Poloha",
+                "metric": "Metrické",
+                "imperial": "Imperiálne"
+            }
+        },
         "geometry": {
             "point": "bod",
             "vertex": "vrchol",
@@ -410,24 +453,28 @@
         "background": {
             "title": "Pozadie",
             "description": "Nastavenia pozadia",
+            "key": "B",
             "percent_brightness": "{opacity}% jas",
             "none": "Žiadne",
             "best_imagery": "Najviac známy zdroj obrázkov pre túto polohu",
             "switch": "Prepnúť späť na toto pozadie",
             "custom": "Voliteľné",
             "custom_button": "Upraviť volitelné pozadie",
+            "custom_prompt": "Vyplňte vzorovú URL pre mapové dlaždice. Platné polia sú: \n    - {zoom}/{z}, {x}, {y} pre Z/X/Y dlaždicovú schému \n    - {ty} pre TMS štýl s prevrátenými Y súradnicami\n    - {u} pre quadtile schému \n    - {switch:a,b,c} pre DNS server multiplexing\n\nPríklad:\n{example}",
             "fix_misalignment": "Upraviť posun obrázkov",
             "imagery_source_faq": "Odkiaľ pochádzajú tieto obrázky?",
             "reset": "vynulovať",
             "offset": "Potiahnutím kdekoľvek v šedej ploche nižšie upravíte posun obrázkov, alebo zadajte hodnotu posunu v metroch.",
             "minimap": {
                 "description": "Náhľad mapy",
-                "tooltip": "Zobraziť oddialenú mapu pre ľahšie lokalizovanie práve zobrazenej oblasti."
+                "tooltip": "Zobraziť oddialenú mapu pre ľahšie lokalizovanie práve zobrazenej oblasti.",
+                "key": "/"
             }
         },
         "map_data": {
             "title": "Mapové údaje",
             "description": "Mapové údaje",
+            "key": "F",
             "data_layers": "Dátové vrstvy",
             "fill_area": "Výplň plôch",
             "map_features": "Mapové objekty",
@@ -486,7 +533,8 @@
         "area_fill": {
             "wireframe": {
                 "description": "Bez výplne (obrys)",
-                "tooltip": "Aktivovanie obrysového módu umožní lepšie vidieť družicové snímky na pozadí."
+                "tooltip": "Aktivovanie obrysového módu umožní lepšie vidieť družicové snímky na pozadí.",
+                "key": "W"
             },
             "partial": {
                 "description": "Čiastočná výplň",
@@ -499,7 +547,9 @@
         },
         "restore": {
             "heading": "Máte neuložené zmeny",
-            "description": "Želáte si obnoviť neuložené zmeny z predchádzajúcej návštevy?"
+            "description": "Želáte si obnoviť neuložené zmeny z predchádzajúcej návštevy?",
+            "restore": "Obnoviť moje zmeny",
+            "reset": "Vymazať moje zmeny"
         },
         "save": {
             "title": "Ulož",
@@ -550,9 +600,9 @@
         },
         "splash": {
             "welcome": "Vitajte v iD editore pre OpenStreetMap",
-            "text": "iD je prívetivý ale silný nástroj pre prispievanie do najlepšej slobodnej mapy sveta. Toto je verzia {version}. Pre viac informácií navštívte {website} a nahlasujte chyby na {github}.",
+            "text": "iD je prívetivý ale silný nástroj pre prispievanie do najlepšej slobodnej mapy sveta. Toto je verzia {version}. Pre viac informácií navštívte {website} alebo nahlasujte chyby na {github}.",
             "walkthrough": "Začni prehliadku",
-            "start": "Upravovať teraz"
+            "start": "Upravuj"
         },
         "source_switch": {
             "live": "pripojený",
@@ -608,8 +658,10 @@
             "view_on_mapillary": "Prezrieť tento obrázok na Mapillary"
         },
         "help": {
-            "title": "Pomoc",
-            "help": "# Pomoc\n\nToto je editor pre [OpenStreetMap](http://www.openstreetmap.org/), slobodnú a upravovateľnú mapu sveta. Môžete ho používať na pridávanie a aktualizovanie údajov vo vašom okolí a vylepšiť tak mapu sveta s otvoreným kódom a dátami pre všetkých.\n\nÚpravy, ktoré v tejto mape spravíte, budú viditeľné pre každého, kto používa OpenStreetMap. Na to, aby ste mohli upravovať, sa budete musieť prihlásiť [prihlásiť](https://www.openstreetmap.org/login).\n\n[iD editor](http://ideditor.com/) je kolaboratívny projekt so [zdrojovým kódom dostupným na GitHub](https://github.com/openstreetmap/iD).\n",
+            "title": "Nápoveda",
+            "key": "H",
+            "help": "# Nápoveda\n\nToto je editor pre [OpenStreetMap](http://www.openstreetmap.org/), slobodnú a upravovateľnú mapu sveta. Môžete ho používať na pridávanie a aktualizovanie údajov vo vašom okolí a vylepšiť tak mapu sveta s otvoreným kódom a dátami pre všetkých.\n\nÚpravy, ktoré v tejto mape spravíte, budú viditeľné pre každého, kto používa OpenStreetMap. Na to, aby ste mohli upravovať, sa budete musieť prihlásiť [prihlásiť](https://www.openstreetmap.org/login).\n\n[iD editor](http://ideditor.com/) je kolaboratívny projekt so [zdrojovým kódom dostupným na GitHub](https://github.com/openstreetmap/iD).\n",
+            "editing_saving": "# Upravovanie a ukladanie\n\nTento editor je primárne navrhnutý na prácu online, a aj práve teraz\nho používate cez internetovú stránku.\n\n### Výber objektov\n\nPre výber objektu, ako napríklad cesta alebo bod záujmu, naň kliknite\nna mape. Týmto sa vybraný objekt zvýrazní, otvorí sa panel s jeho\npodrobnosťami a zobrazí sa ponuka s úkonmi, ktoré môžete s objektom urobiť.\n\nViacero objektov je možné vybrať podržaním klávesu \"Shift\". Potom jednoducho\nkliknite na objekty, ktoré chcete vybrať, alebo pretiahnite po mape akoby ste\nchceli nakresliť obdĺžnik. Týmto sa zobrazí rám a vyberú sa všetky objekty, ktoré\nsa v ňom nachádzajú.\n\n### Ukladanie úprav\nKeď urobíte zmeny ako úpravy ciest, budov a miest, tieto budú lokálne uložené,\naž pokiaľ ich neuložíte na server. Netrápte sa ak urobíte chybu. Zmeny môžete\nvrátiť späť kliknutím na tlačítko vrátiť a zopakovať kliknutím na tlačidlo zopakovať.\n\nKeď chcete ukončiť sériu úprav, kliknite na \"Ulož\". Napríklad ak ste dokončili\nčasť mesta a chcete začať s inou časťou. Budete mať možnosť si prehliadnuť,\nčo ste urobili a editor poskytne užitočné návrhy a upozornenia, ak niečo nie je so\nzmenami v poriadku.\n\nAk všetko vyzerá v poriadku, môžete vyplniť krátky komentár vysvetľujúci, čo ste\nurobili a kliknite znovu na \"Ulož\" pre odoslanie zmien\nna [OpenStreetMap.org](http://www.openstreetmap.org/), kde budú viditeľné\npre ostatných používateľov a tak dostupné pre ďalšie vylepšenia.\n\nAk nemôžete dokončiť úpravy počas jedného sedenia, môžete zatvoriť okno\nprehliadača, vrátiť sa späť (na rovnakom prehliadači a počítači) a editor vám\nponúkne obnoviť vašu prácu.\n\n### Používanie editora\n\nZoznam klávesových skratiek zobrazíte stlačením klávesu \"?\"\n",
             "roads": "# Cesty\n\nS týmto editorom môžete cesty vytvoriť, opraviť alebo vymazať. Cesty môžu byť rôzneho druhu: chodníky, diaľnice, lesné cestičky, cyklochodníky a iné. Akýkoľvek často prechádzaný úsek by malo byť možné zmapovať.\n\n### Výber\n\nKliknite na cestu pre jej výber. Viditeľným by sa mal stať jej obrys spolu s malou ponukou nástrojov na mape a postranným panelom, ukazujúcim dodatočné informácie o ceste.\n\n### Úprava\n\nČasto krát uvidíte cesty, ktoré nie sú zarovnané so snímkami pod nimi alebo s GPS stopu. Tieto cesty môžete upraviť tak, aby boli na správnom mieste.\n\nNajskôr kliknite na cestu, ktorú chcete zmeniť. Týmto sa zvýrazní a po jej dĺžke sa ukážu kontrolné body, ktoré môžete pretiahnuť na lepšiu pozíciu. Ak chcete pridať nový kontrolný bod pre viac detailov, dva krát kliknite na časť cesty bez uzla a jeden bude pridaný.\n\nAk sa cesta spája s inou cestou, ale nie je správne spojená na mape, môžete pretiahnuť jeden z jej kontrolných bodov na druhú cestu, aby ste ich spojili. Spojenie ciest je dôležité pre mapu a nevyhnutné pre poskytovanie navigácie na cestách.\n\nMôžete tiež kliknúť na nástroj \"Presuň\" alebo stlačiť kláves \"M\" pre posunutie celej cesty naraz a potom kliknite znovu, aby ste uložili presun.\n\n### Vymazávanie\n\nAk je cesta úplne nesprávna - vidíte, že cesta neexistuje na satelitných snímkoch a najlepšie mate potvrdené zo samotného miesta, že tam cesta nie je - môžete ju vymazať, čím ju odstránite z mapy. Pri vymazávaní objektov buďte obozretný, rovnako ako pri iných úpravách sú výsledky viditeľné ostatnými a satelitné snímky sú často neaktuálne, takže cesta môže byť jednoducho novopostavená.\n\nCestu môžete vymazať, tak že na ňu kliknete čim ju vyberiete  a potom kliknete na ikonu smetného koša alebo stlačením klávesu \"Delete\".\n\n### Vytváranie\n\nZistili ste, že niekde by mala byť cesta ale ona tam nie je? Kliknite naľavo hore na ikonu \"Čiara\" alebo stlačte kláves \"2\" pre kreslenie čiary.\n\nAby ste začali kresliť, kliknite na začiatok cesty na mape. Ak cesta odbočuje z inej existujúcej cesty, začnite kliknútím na miesto, kde sa spájajú.\n\nPotom kliknite na body pozdĺž cesty tak, aby nasledovali správny smer podľa satelitných snímkov alebo GPS. Ak cesta, ktorú kreslíte, pretína ďalšiu cestu, spojte ich kliknutím v mieste križovatky. Keď ste hotový s skreslením, dva krát kliknite alebo stlačte kláves \"Enter\" na vašej klávesnici.\n",
             "gps": "# GPS\n\nzozbierané GPS údaje sú najcennejší zdroj dát pre OpenStreetMap. Tento editor\npodporuje stopy z lokálnych \".gpx\" súborov na vašom počítači. Tento typ GPS stôp\nmôžete zachytiť pomocou rôznych aplikácií pre smartfóny ako aj GPS\nprístrojmi.\n\nPre informácie, ako robiť GPS prieskum, si prečítajte\n[Mapovanie so smartfónom, GPS alebo papierom](http://learnosm.org/en/mobile-mapping/).\n\nPre použitie GPX stopy pre mapovanie, pretiahnite a pustite GPX súbor na mapový\neditor. Po rozpoznaní, bude pridaná na mapu ako jasná fialová\nčiara. Kliknite na ponuku \"Mapové údaje\" na pravej strane pre zapnutie,\nvypnutie alebo priblíženie na túto novú GPX vrstvu.\n\nGPX stopa nie je priamo nahraná na OpenStreetMap. Najlepší spôsob ako\nju využiť je, použiť ju ako predlohu pre zakreslovanie nových objektov\na potom ju [nahrať na OpenStreetMap](http://www.openstreetmap.org/trace/create)\npre ďalších uživateľov.\n",
             "imagery": "# Snímky povrchu\n\nLetecké snímky sú dôležitým zdrojom pre mapovanie. Kombinácia leteckých fotografií, satelitných snímok a voľne skompilovaných zdrojov je v editore dostupná vpravo pod ponukou \"Nastavenia pozadia\".\n\nŠtandardne je v editore predvolená satelitná vrstva z [Bing Maps](http://www.bing.com/maps/), ale ako posuniete a priblížite mapu na nové geografické miesta, dostupnými sa stanú nové zdroje. Niektoré krajiny ako Spojené Štáty, Francúzsko, a Dánsko majú pre niektoré oblasti dostupné veľmi kvalitné snímky.\n\nSnímky môžu byť niekedy posunuté voči mapovým dátam, kvôli chybe na strane poskytovateľa snímkov. Ak uvidíte veľa ciest posunutých voči pozadiu, neposúvajte ich hneď všetky, aby ste ich zarovnali s pozadím. Namiesto toho môžete upraviť snímky, aby odpovedali existujúcim dátam tým, že kliknete na \"Oprav zarovnanie\" naspodku Nastavenia pozadia.\n",
@@ -796,6 +848,7 @@
                 "title": "Plochy",
                 "add_playground": "*Plochy* sa používajú na zobrazovanie hraníc objektov ako jazerá, budovy alebo rezidenčné zóny.{br}Môžu byť tiež použité na detailnejšie mapovanie objektov, ktoré by ste nomálne označili iba bodom. **Kliknite na {button} Plocha a pridajte novú plochu.** ",
                 "start_playground": "Poďme pridať do mapy ihrisko tým, že nakreslíme plochu. Plochy sa kreslia tak, že pridávate *uzly* pozdĺž vonkajšej hrany objektu. **Kliknite alebo stlačte medzerník pre umiestnenie počiatočného uzla na jeden z rohov ihriska.**",
+                "continue_playground": "Pokračujte v kreslení plochy pridávaním ďalších uzlov pozdĺž hrany ihriska. Je poriadku ak spojíte plochu s existujúcimi chodníkmi.{br}Tip: Podržaním klávesu \"{alt}\" zabránite uzlom v spájaní s ďalšími objektami. **Pokračujte v kreslní plochy inhriska.**",
                 "finish_playground": "Dokončite plochu tým, že stlačíte enter alebo kliknete na prvý alebo posledný uzol. **Dokončite kreslenie plochy ihriska.**",
                 "search_playground": "**Vyhľadajte \"{preset}.**",
                 "choose_playground": "**Vyberte {preset} zo zoznamu.**",
@@ -860,14 +913,134 @@
             },
             "startediting": {
                 "title": "Začať upravovať",
+                "help": "Teraz ste pripravný upravovať OpenStreetMap!{br}Túto prehliadku môžete hocikedy zopakovať alebo si môžete prezrieť dokumentáciu tým, že kliknete na tlačítko {button} Nápoveda alebo stalčením klávesu \"{key}\".",
+                "shortcuts": "Zoznam príkazov a ich klávesových skratiek si môžete pozrieť stlačením klávesu \"{key}\".",
                 "save": "Nezabudnite pravidelne ukladať vaše zmeny!",
                 "start": "Začnite mapovať!"
             }
         },
+        "shortcuts": {
+            "title": "Klávesové skratky",
+            "tooltip": "Zobraziť okno s klávesovými skratkami.",
+            "toggle": {
+                "key": "?"
+            },
+            "key": {
+                "alt": "Alt",
+                "backspace": "Backspace",
+                "cmd": "Cmd",
+                "ctrl": "Ctrl",
+                "delete": "Delete",
+                "del": "Del",
+                "end": "End",
+                "enter": "Enter",
+                "esc": "Esc",
+                "home": "Home",
+                "option": "Option",
+                "pause": "Pause",
+                "pgdn": "PgDn",
+                "pgup": "PgUp",
+                "return": "Return",
+                "shift": "Shift",
+                "space": "Medzerník"
+            },
+            "gesture": {
+                "drag": "potiahnúť"
+            },
+            "or": "-alebo-",
+            "browsing": {
+                "title": "Prehliadanie",
+                "navigation": {
+                    "title": "Navigácia",
+                    "pan": "Posun mapy",
+                    "pan_more": "Posunúť mapu o jednu obrazovku",
+                    "zoom": "Priblížiť / Oddialiť",
+                    "zoom_more": "Priblížiť / Oddialiť o hodne"
+                },
+                "help": {
+                    "title": "Nápoveda",
+                    "help": "Ukázať nápovedu/dokumentáciu",
+                    "keyboard": "Ukázať klávesové skratky"
+                },
+                "display_options": {
+                    "title": "Zobraziť možnosti",
+                    "background": "Ukázať možnosti pozadia",
+                    "background_switch": "Prepnúť naspäť na posledné pozadie",
+                    "map_data": "Ukázať možnosti mapových dát",
+                    "fullscreen": "Vstúpiť do celoobrazovkového režimu",
+                    "wireframe": "Prepnúť obrysový mód",
+                    "minimap": "Prepnúť minimapu"
+                },
+                "selecting": {
+                    "title": "Vyberanie objektov",
+                    "select_one": "Vybrať jeden objekt",
+                    "select_multi": "Vybrať viacero objektov",
+                    "lasso": "Nakresliť výberové laso okolo objektov"
+                },
+                "with_selected": {
+                    "title": "S vybraným objektom",
+                    "edit_menu": "Prepnúť editačné menu"
+                },
+                "vertex_selected": {
+                    "title": "S vybraným uzlom",
+                    "previous": "Preskočiť na predchádzajúci uzol",
+                    "next": "Preskočiť na nasledujúci uzol",
+                    "first": "Preskočiť na prvý uzol",
+                    "last": "Preskočiť na posledný uzol",
+                    "change_parent": "Prepnúť nadradenú cestu"
+                }
+            },
+            "editing": {
+                "title": "Upravovanie",
+                "drawing": {
+                    "title": "Kreslenie",
+                    "add_point": "\"Pridať bod\" mód",
+                    "add_line": "\"Pridať čiaru\" mód",
+                    "add_area": "\"Pridať plochu\" mód",
+                    "place_point": "Umiestniť bod",
+                    "disable_snap": "Podržanie zruší prichytávanie k bodu",
+                    "stop_line": "Dokončiť kreslenie čiary alebo plochy"
+                },
+                "operations": {
+                    "title": "Operácie",
+                    "continue_line": "Pokračuvať v ceste od vybraného uzlu",
+                    "merge": "Spojiť (zlúčiť) vybrané objekty",
+                    "disconnect": "Odpojiť objekty na vybranom uzle",
+                    "split": "Rozdeliť čiaru na dve vo vybranom uzle",
+                    "reverse": "Obrátiť smer čiary",
+                    "move": "Presunúť vybraný objet",
+                    "rotate": "Otočiť vybrané objekty",
+                    "orthogonalize": "Vyrovnať čiaru / Usporiadať plochu do pravého uhla",
+                    "circularize": "Usporiadať uzavretú čiaru alebo plochu do kruhu",
+                    "reflect_long": "Preklopiť objekty cez ich dlhú osu",
+                    "reflect_short": "Preklopiť objekty cez ich kratšiu osu",
+                    "delete": "Vymazať vybrané objekty"
+                },
+                "commands": {
+                    "title": "Príkazy",
+                    "copy": "Kopírovať vybrané objekty",
+                    "paste": "Vložiť zkopírované objekty",
+                    "undo": "Vrátiť posledný úkon",
+                    "redo": "Zopakovať posledný úkon",
+                    "save": "Uložiť zmeny"
+                }
+            },
+            "tools": {
+                "title": "Nástroje",
+                "info": {
+                    "title": "Informácie",
+                    "all": "Prepnúť všetky informačné panely",
+                    "background": "Prepnúť panel pozadia",
+                    "history": "Prepnúť panel histórie",
+                    "location": "Prepnúť panel polohy",
+                    "measurement": "Prepnúť panel merania"
+                }
+            }
+        },
         "presets": {
             "categories": {
                 "category-barrier": {
-                    "name": "Objekty bariér"
+                    "name": "Objekty bariéra"
                 },
                 "category-building": {
                     "name": "Objekty budov"
@@ -878,6 +1051,15 @@
                 "category-landuse": {
                     "name": "Objekty využitia územia"
                 },
+                "category-natural-area": {
+                    "name": "Prírodné objekty"
+                },
+                "category-natural-line": {
+                    "name": "Prírodné objekty"
+                },
+                "category-natural-point": {
+                    "name": "Prírodné objekty"
+                },
                 "category-path": {
                     "name": "Objekty cestičiek"
                 },
@@ -951,20 +1133,36 @@
                 "address": {
                     "label": "Adresa",
                     "placeholders": {
+                        "block_number": "Číslo bloku",
+                        "block_number!jp": "Blok číslo",
                         "city": "Mesto",
+                        "city!jp": "Mesto/dedina/Okrsok Tokya",
+                        "city!vn": "Mesto",
                         "conscriptionnumber": "123",
                         "country": "Štát",
+                        "county": "Kraj",
+                        "county!jp": "Distrikt",
                         "district": "Okres",
+                        "district!vn": "Arrondissement/Mesto/Distrikt",
+                        "floor": "Poschodie",
                         "hamlet": "Osada/Samota",
                         "housename": "Meno domu",
                         "housenumber": "123",
+                        "housenumber!jp": "Budova číslo/Miesto čislo",
+                        "neighbourhood": "Susedstvo",
+                        "neighbourhood!jp": "Chōme/Aza/Koaza",
                         "place": "Obec",
                         "postcode": "PSČ",
                         "province": "Provincia",
+                        "province!jp": "Prefektúra",
+                        "quarter": "Štvrť",
+                        "quarter!jp": "Ōaza/Machi",
                         "state": "Štát",
                         "street": "Ulica",
                         "subdistrict": "Podoblasť",
-                        "suburb": "Predmestie"
+                        "subdistrict!vn": "Okrsok/Komúna/Mestečko",
+                        "suburb": "Predmestie",
+                        "suburb!jp": "Okrsok"
                     }
                 },
                 "admin_level": {
@@ -1013,6 +1211,15 @@
                 "amenity": {
                     "label": "Typ"
                 },
+                "animal_boarding": {
+                    "label": "Pre zvieratá"
+                },
+                "animal_breeding": {
+                    "label": "Pre zvieratá"
+                },
+                "animal_shelter": {
+                    "label": "Pre zvieratá"
+                },
                 "area/highway": {
                     "label": "Typ"
                 },
@@ -1031,12 +1238,41 @@
                 "barrier": {
                     "label": "Typ"
                 },
+                "bath/open_air": {
+                    "label": "Vonkajší"
+                },
+                "bath/sand_bath": {
+                    "label": "Piesočná kúpeľ"
+                },
+                "bath/type": {
+                    "label": "Typ",
+                    "options": {
+                        "foot_bath": "Kúpeľ nôh",
+                        "hot_spring": "Termálna kúpeľ",
+                        "onsen": "Japonský Onsen"
+                    }
+                },
+                "beauty": {
+                    "label": "Typ obchodu"
+                },
                 "bench": {
                     "label": "Lavička"
                 },
                 "bicycle_parking": {
                     "label": "Typ"
                 },
+                "bin": {
+                    "label": "Odpadová nádoba"
+                },
+                "blood_components": {
+                    "label": "Zložky krvi",
+                    "options": {
+                        "plasma": "plazma",
+                        "platelets": "krvné doštičky",
+                        "stemcells": "vzorky kmeňových buniek",
+                        "whole": "celá krv"
+                    }
+                },
                 "board_type": {
                     "label": "Typ"
                 },
@@ -1056,8 +1292,20 @@
                     "label": "Typ"
                 },
                 "camera/direction": {
+                    "label": "Smer (Stupňov v smere hodín)",
                     "placeholder": "45, 90, 180, 270"
                 },
+                "camera/mount": {
+                    "label": "Upevnenie kamery"
+                },
+                "camera/type": {
+                    "label": "Typ kamery",
+                    "options": {
+                        "dome": "Kupola",
+                        "fixed": "Nepohyblivá",
+                        "panning": "Panoramatická"
+                    }
+                },
                 "capacity": {
                     "label": "Kapacita",
                     "placeholder": "50, 100, 200..."
@@ -1093,15 +1341,25 @@
                         "clockwise": "V smere hodinových ručičiek"
                     }
                 },
+                "clothes": {
+                    "label": "Typ oblečenia"
+                },
                 "club": {
                     "label": "Typ"
                 },
                 "collection_times": {
                     "label": "Časy výberov"
                 },
+                "communication_multi": {
+                    "label": "Typy komunikácie"
+                },
                 "construction": {
                     "label": "Typ"
                 },
+                "contact/webcam": {
+                    "label": "URL webovej kamery",
+                    "placeholder": "http://priklad.sk/"
+                },
                 "content": {
                     "label": "Obsah"
                 },
@@ -1114,12 +1372,21 @@
                 "craft": {
                     "label": "Typ"
                 },
+                "crop": {
+                    "label": "Plodiny"
+                },
                 "crossing": {
                     "label": "Typ"
                 },
+                "cuisine": {
+                    "label": "Jedlo"
+                },
                 "currency_multi": {
                     "label": "Typy mien"
                 },
+                "cycle_network": {
+                    "label": "Sieť"
+                },
                 "cycleway": {
                     "label": "Cyklopruh",
                     "options": {
@@ -1158,6 +1425,9 @@
                         "cycleway:right": "Pravá strana"
                     }
                 },
+                "date": {
+                    "label": "Dátum"
+                },
                 "delivery": {
                     "label": "Zásobovnie"
                 },
@@ -1173,6 +1443,9 @@
                 "diaper": {
                     "label": "Obsahuje miesto na výmenu plienok"
                 },
+                "display": {
+                    "label": "Ciferník"
+                },
                 "dock": {
                     "label": "Typ"
                 },
@@ -1192,6 +1465,10 @@
                 "elevation": {
                     "label": "Nadmorská výška"
                 },
+                "email": {
+                    "label": "Email",
+                    "placeholder": "http://priklad.sk/"
+                },
                 "emergency": {
                     "label": "Záchranná služba"
                 },
@@ -1208,6 +1485,15 @@
                 "fee": {
                     "label": "Poplatok"
                 },
+                "fence_type": {
+                    "label": "Typ"
+                },
+                "fire_hydrant/position": {
+                    "label": "Pozícia",
+                    "options": {
+                        "parking_lot": "Parkovisko"
+                    }
+                },
                 "fire_hydrant/type": {
                     "label": "Typ",
                     "options": {
@@ -1241,6 +1527,9 @@
                 "generator/method": {
                     "label": "Metóda"
                 },
+                "generator/output/electricity": {
+                    "placeholder": "50 MW, 100 MW, 200 MW..."
+                },
                 "generator/source": {
                     "label": "Zdroj"
                 },
@@ -1258,6 +1547,9 @@
                 "handrail": {
                     "label": "Zábradlie"
                 },
+                "height": {
+                    "label": "Výška (metrov)"
+                },
                 "highway": {
                     "label": "Typ"
                 },
@@ -1300,6 +1592,9 @@
                 "internet_access/fee": {
                     "label": "Poplatok za prístup k Internetu"
                 },
+                "internet_access/ssid": {
+                    "label": "SSID (Názov siete)"
+                },
                 "lamp_type": {
                     "label": "Typ"
                 },
@@ -1371,6 +1666,9 @@
                 "man_made": {
                     "label": "Typ"
                 },
+                "manhole": {
+                    "label": "Typ"
+                },
                 "map_type": {
                     "label": "Typ"
                 },
@@ -1385,6 +1683,9 @@
                 "maxstay": {
                     "label": "Maximálna dĺžka parkovania"
                 },
+                "maxweight": {
+                    "label": "Maximálna hmotnosť"
+                },
                 "mtb/scale": {
                     "label": "Obtiažnosť pre horské bicykle",
                     "options": {
@@ -1431,6 +1732,39 @@
                 "network": {
                     "label": "Sieť"
                 },
+                "network_bicycle": {
+                    "label": "Typ sieťe",
+                    "options": {
+                        "icn": "Medzinárodná",
+                        "lcn": "Lokálna",
+                        "ncn": "Národná",
+                        "rcn": "Regionálna"
+                    },
+                    "placeholder": "Lokálna, Regionálna, Narodná, Medzinárodná"
+                },
+                "network_foot": {
+                    "label": "Typ siete",
+                    "options": {
+                        "iwn": "Medzinárodná",
+                        "lwn": "Lokálna",
+                        "nwn": "Národná",
+                        "rwn": "Regionálna"
+                    },
+                    "placeholder": "Lokálna, Regionálna, Narodná, Medzinárodná"
+                },
+                "network_horse": {
+                    "label": "Typ sieťe",
+                    "options": {
+                        "ihn": "Medzinárodná",
+                        "lhn": "Lokálna",
+                        "nhn": "Národná",
+                        "rhn": "Regionálna"
+                    },
+                    "placeholder": "Lokálna, Regionálna, Narodná, Medzinárodná"
+                },
+                "network_road": {
+                    "label": "Sieť"
+                },
                 "note": {
                     "label": "Poznámka"
                 },
@@ -1459,6 +1793,9 @@
                 "operator": {
                     "label": "Operátor"
                 },
+                "outdoor_seating": {
+                    "label": "Vonkajšie sedenie"
+                },
                 "par": {
                     "label": "Par",
                     "placeholder": "3, 4, 5..."
@@ -1533,6 +1870,9 @@
                 "place": {
                     "label": "Typ"
                 },
+                "plant/output/electricity": {
+                    "placeholder": "500 MW, 1000 MW, 2000 MW..."
+                },
                 "population": {
                     "label": "Populácia"
                 },
@@ -1542,12 +1882,25 @@
                 "power_supply": {
                     "label": "Elektrický zdoj"
                 },
+                "produce": {
+                    "label": "Ovocie a zelenina"
+                },
+                "product": {
+                    "label": "Produkty"
+                },
                 "railway": {
                     "label": "Typ"
                 },
                 "recycling_accepts": {
                     "label": "Prijíma"
                 },
+                "recycling_type": {
+                    "label": "Typ recyklácie",
+                    "options": {
+                        "centre": "Recyklačné centrum",
+                        "container": "Kontajner"
+                    }
+                },
                 "ref": {
                     "label": "Referenčné čislo"
                 },
@@ -1654,9 +2007,27 @@
                 "source": {
                     "label": "Zdroj"
                 },
+                "sport": {
+                    "label": "Športy"
+                },
+                "sport_ice": {
+                    "label": "Športy"
+                },
+                "sport_racing_motor": {
+                    "label": "Športy"
+                },
+                "sport_racing_nonmotor": {
+                    "label": "Športy"
+                },
                 "stars": {
                     "label": "Hviezdičky"
                 },
+                "start_date": {
+                    "label": "Počiatočný dátum"
+                },
+                "step_count": {
+                    "label": "Počet schodov"
+                },
                 "stop": {
                     "label": "Typ zastavenia",
                     "options": {
@@ -1684,9 +2055,26 @@
                 "supervised": {
                     "label": "Pod dohľadom"
                 },
+                "support": {
+                    "label": "Podpera"
+                },
                 "surface": {
                     "label": "Povrch"
                 },
+                "surveillance": {
+                    "label": "Typ monitorovania"
+                },
+                "surveillance/type": {
+                    "label": "Druh monitorovacieho zariadenia",
+                    "options": {
+                        "ALPR": "Automatická čitačka ŠPZ",
+                        "camera": "Kamera",
+                        "guard": "Strážnik"
+                    }
+                },
+                "surveillance/zone": {
+                    "label": "Monitorovaná zóna"
+                },
                 "tactile_paving": {
                     "label": "Taktilné značenie"
                 },
@@ -1708,9 +2096,22 @@
                         "pitlatrine": "Latrína"
                     }
                 },
+                "toll": {
+                    "label": "Mýto"
+                },
+                "tomb": {
+                    "label": "Typ"
+                },
                 "tourism": {
                     "label": "Typ"
                 },
+                "tower/construction": {
+                    "label": "Konštrukcia veže",
+                    "placeholder": "Ukotvená, Mrežovaná, Maskovaná, ..."
+                },
+                "tower/type": {
+                    "label": "Typ"
+                },
                 "tracktype": {
                     "label": "Typ lesnej cesty",
                     "options": {
@@ -1722,6 +2123,9 @@
                     },
                     "placeholder": "Pevná, väčšinou pevná, mäkká..."
                 },
+                "traffic_calming": {
+                    "label": "Typ"
+                },
                 "traffic_signals": {
                     "label": "Typ"
                 },
@@ -1746,6 +2150,17 @@
                 "vending": {
                     "label": "Typ tovaru"
                 },
+                "visibility": {
+                    "label": "Viditeľnosť",
+                    "options": {
+                        "area": "Nad 20m (65 stôp)",
+                        "house": "Do 5m (16 stôp)",
+                        "street": "5 až 20m (16 až 65 stôp)"
+                    }
+                },
+                "wall": {
+                    "label": "Typ"
+                },
                 "water": {
                     "label": "Typ"
                 },
@@ -1777,6 +2192,10 @@
                     "name": "Adresa",
                     "terms": "adresa,ŠPZ,SPZ,ulica"
                 },
+                "advertising/billboard": {
+                    "name": "Bilboard",
+                    "terms": "bilbord,bilboardy,billboardy,reklama,pútač,putac"
+                },
                 "aerialway": {
                     "name": "Vzdušná doprava"
                 },
@@ -1788,14 +2207,26 @@
                     "name": "Kabínková lanovka",
                     "terms": "kabinkova lanovka,lanovka,kabinky,kabínky"
                 },
+                "aerialway/drag_lift": {
+                    "name": "Vlek",
+                    "terms": "lyžiarsky vlek, lyziarsky vlek"
+                },
                 "aerialway/gondola": {
                     "name": "Kyvadlová lanovka",
                     "terms": "kyvadlova lanovka,kyvadlo,lanovka,kabínka,kabinka"
                 },
+                "aerialway/goods": {
+                    "name": "Zásobovacia lanovka",
+                    "terms": "zasobovacia lanovka"
+                },
                 "aerialway/magic_carpet": {
                     "name": "Pásový vlek",
                     "terms": "pasovy vlek"
                 },
+                "aerialway/mixed_lift": {
+                    "name": "Kombinovaná lanovka",
+                    "terms": "kobinovana lanovka"
+                },
                 "aerialway/platter": {
                     "name": "Kotvový vlek",
                     "terms": "kotvovy vlek,kotva"
@@ -1827,6 +2258,10 @@
                     "name": "Odbavovacia plocha",
                     "terms": "Letisko,pristávacia plocha,terminál,príletová hala,odbavovacia plocha"
                 },
+                "aeroway/gate": {
+                    "name": "Letisková brána",
+                    "terms": "letiskova brana,brána,brana"
+                },
                 "aeroway/hangar": {
                     "name": "Hangár",
                     "terms": "hangar,hangár,letisko"
@@ -1843,6 +2278,10 @@
                     "name": "Rolovacia dráha",
                     "terms": "rolovanie, rolovacia draha, rolovacia dráha"
                 },
+                "aeroway/terminal": {
+                    "name": "Letiskový termnál",
+                    "terms": "letiskovy terminal,terminal,terminál"
+                },
                 "amenity": {
                     "name": "Občianska vybavenosť"
                 },
@@ -4184,11 +4623,207 @@
                     "name": "Pitná voda pre lode",
                     "terms": "pitna voda pre lode"
                 },
+                "waterway/waterfall": {
+                    "name": "Vodopád",
+                    "terms": "vodopad,voda,pereje,rieka"
+                },
                 "waterway/weir": {
                     "name": "Hrádza",
                     "terms": "hat,hať,hrádza,hradza,jez"
                 }
             }
+        },
+        "imagery": {
+            "Bing": {
+                "description": "Satelitné a letecké zábery",
+                "name": "Bing letecké zábery"
+            },
+            "DigitalGlobe-Premium": {
+                "attribution": {
+                    "text": "Podmienky & pripomienky"
+                },
+                "description": "Prémiové satelitné zábery DigitalGlobe.",
+                "name": "DigitalGlobe prémiové zábery"
+            },
+            "DigitalGlobe-Standard": {
+                "attribution": {
+                    "text": "Podmienky & pripomienky"
+                },
+                "description": "Štandardné satelitné zábery DigitalGlobe.",
+                "name": "DigitalGlobe štandardné zábery"
+            },
+            "MAPNIK": {
+                "attribution": {
+                    "text": "© OpenStreetMap prispievatelia, CC-BY-SA"
+                },
+                "description": "Štandardná vrstva OpenStreetMap.",
+                "name": "OpenStreetMap (Štandardná)"
+            },
+            "Mapbox": {
+                "attribution": {
+                    "text": "Podmienky & pripomienky"
+                },
+                "description": "Satelitné a letecké zábery",
+                "name": "Mapbox satelitné"
+            },
+            "New_and_Misaligned_TIGER_Roads-2013": {
+                "description": "Verejne dostupné mapové údaje od US Census na úrovniach 16+. Na nižšom priblížení sú iba zmeny od roku 2006 bez zmien, ktoré sú už vložené do OpenStreetMap.",
+                "name": "Nové & posunuté cesty z TIGER"
+            },
+            "OSM_Inspector-Addresses": {
+                "attribution": {
+                    "text": "© Geofabrik GmbH, OpenStreetMap prispievatelia, CC-BY-SA"
+                },
+                "name": "OSM Inspector: Adresy"
+            },
+            "OSM_Inspector-Geometry": {
+                "attribution": {
+                    "text": "© Geofabrik GmbH, OpenStreetMap prispievatelia, CC-BY-SA"
+                },
+                "name": "OSM Inspector: Geometria"
+            },
+            "OSM_Inspector-Highways": {
+                "attribution": {
+                    "text": "© Geofabrik GmbH, OpenStreetMap prispievatelia, CC-BY-SA"
+                },
+                "name": "OSM Inspector: Cesty"
+            },
+            "OSM_Inspector-Multipolygon": {
+                "attribution": {
+                    "text": "© Geofabrik GmbH, OpenStreetMap prispievatelia, CC-BY-SA"
+                },
+                "name": "OSM Inspector: Plochy"
+            },
+            "OSM_Inspector-Places": {
+                "attribution": {
+                    "text": "© Geofabrik GmbH, OpenStreetMap prispievatelia, CC-BY-SA"
+                },
+                "name": "OSM Inspector: Miesta"
+            },
+            "OSM_Inspector-Routing": {
+                "attribution": {
+                    "text": "© Geofabrik GmbH, OpenStreetMap prispievatelia, CC-BY-SA"
+                },
+                "name": "OSM Inspector: Nevigovanie"
+            },
+            "OSM_Inspector-Tagging": {
+                "attribution": {
+                    "text": "© Geofabrik GmbH, OpenStreetMap prispievatelia, CC-BY-SA"
+                },
+                "name": "OSM Inspector: Označenia"
+            },
+            "Waymarked_Trails-Cycling": {
+                "attribution": {
+                    "text": "© Sarah Hoffmann, CC by-SA 3.0, mapové údaje OpenStreetMap prispievatelia, ODbL 1.0"
+                },
+                "name": "Waymarked Trails: Cyklistika"
+            },
+            "Waymarked_Trails-Hiking": {
+                "attribution": {
+                    "text": "© Sarah Hoffmann, CC by-SA 3.0, mapové údaje OpenStreetMap prispievatelia, ODbL 1.0"
+                },
+                "name": "Waymarked Trails: Turistika"
+            },
+            "Waymarked_Trails-MTB": {
+                "attribution": {
+                    "text": "© Sarah Hoffmann, CC by-SA 3.0, mapové údaje OpenStreetMap prispievatelia, ODbL 1.0"
+                },
+                "name": "Waymarked Trails: Horské bicykle"
+            },
+            "Waymarked_Trails-Skating": {
+                "attribution": {
+                    "text": "© Sarah Hoffmann, CC by-SA 3.0, mapové údaje OpenStreetMap prispievatelia, ODbL 1.0"
+                },
+                "name": "Waymarked Trails: Skating"
+            },
+            "Waymarked_Trails-Winter_Sports": {
+                "attribution": {
+                    "text": "© Sarah Hoffmann, CC by-SA 3.0, mapové údaje OpenStreetMap prispievatelia, ODbL 1.0"
+                },
+                "name": "Waymarked Trails: Zimné športy"
+            },
+            "basemap.at": {
+                "attribution": {
+                    "text": "basemap.at"
+                },
+                "description": "Základná mapa Rakúska, odvodená z vládnych dát.",
+                "name": "basemap.at"
+            },
+            "basemap.at-orthofoto": {
+                "attribution": {
+                    "text": "basemap.at"
+                },
+                "description": "Letecké snímky poskytnuté od basemap.at. Nástupca záberov geoimage.at.",
+                "name": "basemap.at Orthofoto"
+            },
+            "hike_n_bike": {
+                "attribution": {
+                    "text": "© OpenStreetMap prispievatielia"
+                },
+                "name": "Turistika & cyklo"
+            },
+            "mapbox_locator_overlay": {
+                "attribution": {
+                    "text": "Podmienky & pripomienky"
+                },
+                "description": "Zobraziť hlavné objekty pre lepšiu orientáciu.",
+                "name": "Lokátorová vrstva"
+            },
+            "openpt_map": {
+                "attribution": {
+                    "text": "© OpenStreetMap prispievatelia, CC-BY-SA"
+                },
+                "name": "OpenPT mapa (prekrytie)"
+            },
+            "osm-gps": {
+                "attribution": {
+                    "text": "© OpenStreetMap prispievatielia"
+                },
+                "description": "Verejné GPS stopy nahrané do OpenStreetMap.",
+                "name": "OpenStreetMap GPS stopy"
+            },
+            "osm-mapnik-black_and_white": {
+                "attribution": {
+                    "text": "© OpenStreetMap prispievatelia, CC-BY-SA"
+                },
+                "name": "OpenStreetMap (Štandardná čiernobiela)"
+            },
+            "osm-mapnik-german_style": {
+                "attribution": {
+                    "text": "© OpenStreetMap prispievatelia, CC-BY-SA"
+                },
+                "name": "OpenStreetMap (Nemecký štýl)"
+            },
+            "qa_no_address": {
+                "attribution": {
+                    "text": "Simon Poole, Údaje ©OpenStreetMap prispievatelia"
+                },
+                "name": "QA bez adries"
+            },
+            "skobbler": {
+                "attribution": {
+                    "text": "© Dlaždice: skobbler Mapové údaje: OpenStreetMap prispievatelia"
+                },
+                "name": "skobbler"
+            },
+            "stamen-terrain-background": {
+                "attribution": {
+                    "text": "Mapové dlaždice od Stamen Design, pod CC BY 3.0"
+                },
+                "name": "Stamen terén"
+            },
+            "tf-cycle": {
+                "attribution": {
+                    "text": "Mapa © Thunderforest, Údaje © OpenStreetMap prispievatelia"
+                },
+                "name": "Thunderforest OpenCycleMap"
+            },
+            "tf-landscape": {
+                "attribution": {
+                    "text": "Mapa © Thunderforest, Údaje © OpenStreetMap prispievatelia"
+                },
+                "name": "Thunderforest Krajina"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/sl.json b/dist/locales/sl.json
index 1753d9f0b..ee6aca26c 100644
--- a/dist/locales/sl.json
+++ b/dist/locales/sl.json
@@ -348,6 +348,49 @@
             "list": "Spremembe uporabnikov {users}",
             "truncated_list": "Spremembe uporabnikov {users} in {count} drugih"
         },
+        "info_panels": {
+            "key": "I",
+            "background": {
+                "key": "O",
+                "title": "Ozadje",
+                "zoom": "Približaj",
+                "vintage": "Starinsko",
+                "unknown": "Neznano",
+                "show_tiles": "Pokaži sličice",
+                "hide_tiles": "Skrij sličice"
+            },
+            "history": {
+                "key": "Z",
+                "title": "Zgodovina",
+                "selected": "{n} izbranih",
+                "version": "Različica",
+                "last_edit": "Zadnje urejanje",
+                "edited_by": "Urejevalec",
+                "changeset": "Spremembe",
+                "unknown": "Neznano",
+                "link_text": "Zgodovina na openstreetmap.org"
+            },
+            "location": {
+                "key": "L",
+                "title": "Mesto",
+                "unknown_location": "Neznano mesto"
+            },
+            "measurement": {
+                "key": "M",
+                "title": "Merilo",
+                "selected": "{n} izbranih",
+                "geometry": "Geometrija",
+                "closed": "zaprto",
+                "center": "Središče",
+                "perimeter": "Obseg",
+                "length": "Dolžina",
+                "area": "Površina",
+                "centroid": "Središčna točka",
+                "location": "Mesto",
+                "metric": "Metrične enote",
+                "imperial": "Imperialne enote"
+            }
+        },
         "geometry": {
             "point": "točka",
             "vertex": "ogljišče",
@@ -417,6 +460,7 @@
             "switch": "Preklopi nazaj na to ozadje.",
             "custom": "Po meri",
             "custom_button": "Uredi ozadje po meri",
+            "custom_prompt": "Vpišite naslov url predloge sličic. Veljavni žetoni so:\n   - {zoom}/{z}, {x}, {y} za Z/X/Y sheme sličic\n   - {ty} za koordinate v zapisu TMS\n   - {u} za shemo četverjenja – quadtile\n   - {switch:a,b,c} za zvijanje pretoka prek strežnika DNS\n\nPrimer:\n{example}",
             "fix_misalignment": "Popravi zamik ozadja",
             "imagery_source_faq": "Od kod so ozadja zemljevida?",
             "reset": "ponastavi",
@@ -503,7 +547,9 @@
         },
         "restore": {
             "heading": "Nekatere spremembe še niso shranjene.",
-            "description": "Ali želite ponovno obnoviti še ne shranjene spremembe predhodne seje urejanja?"
+            "description": "Ali želite ponovno obnoviti še ne shranjene spremembe predhodne seje urejanja?",
+            "restore": "Obnovi spremembe",
+            "reset": "Zavrzi spremembe"
         },
         "save": {
             "title": "Shrani",
@@ -978,6 +1024,17 @@
                     "redo": "Ponovno uveljavi zadnje dejanje",
                     "save": "Shrani spremembe"
                 }
+            },
+            "tools": {
+                "title": "Orodja",
+                "info": {
+                    "title": "Podrobnosti",
+                    "all": "Preklopi vsa okna podrobnosti",
+                    "background": "Preklopi okno ozadja",
+                    "history": "Preklopi okno zgodovine",
+                    "location": "Preklopi okno mesta",
+                    "measurement": "Preklopi okno merila"
+                }
             }
         },
         "presets": {
@@ -1300,9 +1357,6 @@
                     "label": "Naslov URL spletne kamere",
                     "placeholder": "http://www.naslov.si/"
                 },
-                "content": {
-                    "label": "Vsebina"
-                },
                 "country": {
                     "label": "Država"
                 },
@@ -3866,6 +3920,9 @@
                     "name": "Sedlo",
                     "terms": "Sedlo, škrbina"
                 },
+                "natural/sand": {
+                    "name": "Pesek"
+                },
                 "natural/scree": {
                     "name": "Melišče",
                     "terms": "grušč"
diff --git a/dist/locales/sr.json b/dist/locales/sr.json
index b18595d97..21a738edb 100644
--- a/dist/locales/sr.json
+++ b/dist/locales/sr.json
@@ -654,9 +654,6 @@
                 "construction": {
                     "label": "Врста"
                 },
-                "content": {
-                    "label": "Садржај"
-                },
                 "country": {
                     "label": "Земља"
                 },
diff --git a/dist/locales/sv.json b/dist/locales/sv.json
index 4befdb1bf..c4b7afff9 100644
--- a/dist/locales/sv.json
+++ b/dist/locales/sv.json
@@ -1341,6 +1341,9 @@
                         "clockwise": "Medsols"
                     }
                 },
+                "clothes": {
+                    "label": "Kläder"
+                },
                 "club": {
                     "label": "Typ"
                 },
@@ -1527,6 +1530,10 @@
                 "generator/method": {
                     "label": "Metod"
                 },
+                "generator/output/electricity": {
+                    "label": "Effektuttaget",
+                    "placeholder": "50 MW, 100 MW, 200 MW..."
+                },
                 "generator/source": {
                     "label": "Källa"
                 },
@@ -1891,6 +1898,10 @@
                 "plant": {
                     "label": "Växt"
                 },
+                "plant/output/electricity": {
+                    "label": "Effektuttaget",
+                    "placeholder": "500 MW, 1000 MW, 2000 MW..."
+                },
                 "population": {
                     "label": "Folkmängd"
                 },
@@ -2570,6 +2581,10 @@
                     "name": "Kyrka",
                     "terms": "Kyrka, tempel, gudshus, kyrkobyggnad, kapell, bönehus, böneplats, missionshus, dom, katedral, helgedom, gudstjänstlokal,tro, religion, helgedom, kristen, kristendom, församling, tillbedjan, predikan, katedral, kor, kapell, guds hus, gud, bönehus, socken, helgedom, tempel"
                 },
+                "amenity/place_of_worship/hindu": {
+                    "name": "Hindutempel",
+                    "terms": "hindu, hinduism, Sanatana Dharma, garbhagriha,  puja, arcana, helgedom, tempel"
+                },
                 "amenity/place_of_worship/jewish": {
                     "name": "Synagoga",
                     "terms": "Synagoga, tempel, gudshus, bönehus, böneplats, missionshus, dom, katedral, helgedom, gudstjänstlokal,tro, religion, helgedom, Jude, Judendom, tillbedjan, predikan"
@@ -2578,6 +2593,18 @@
                     "name": "Moské",
                     "terms": "moské, gudshus, kyrkobyggnad, bönehus, böneplats, helgedom, gudstjänstlokal,tro, religion, helgedom, tillbedjan, muslim, predikan, minaret"
                 },
+                "amenity/place_of_worship/shinto": {
+                    "name": "Jinja (Shintoistisk helgedom)",
+                    "terms": "Jinja, shintoism, Shinto, kami, torii, yashiro, miya, jingū, Shinto shrine, shrine, shintohelgedom, helgedom, tempel"
+                },
+                "amenity/place_of_worship/sikh": {
+                    "name": "Sikhiskt tempel",
+                    "terms": "Sikh, Sikh-tempel, Sikhtempel, Sikhism, Gurudwara, tempel, helgedom"
+                },
+                "amenity/place_of_worship/taoist": {
+                    "name": "Taoistiskt tempel",
+                    "terms": "Taoism, Taoistiskt tempel, daoism, tao, tempel, helgedom"
+                },
                 "amenity/planetarium": {
                     "name": "Planetarium",
                     "terms": "Planetarium,museum, astronomi, observatorium"
@@ -2743,6 +2770,10 @@
                     "name": "Veterinär ",
                     "terms": "Veterinär, djurläkare, djurdoktor, djurklinik, djursjukhus"
                 },
+                "amenity/waste/dog_excrement": {
+                    "name": "Sopkärl för hundbajspåsar",
+                    "terms": "Sopkärl för hundbajspåsar, hundbajs, hundbajspåsar, hundbajspåse, hund, bajs, bajspåsar, soptunna, sopkärl, hundskit, skitpåse"
+                },
                 "amenity/waste_basket": {
                     "name": "Soptunna (liten)",
                     "terms": "Soptunna, papperskorg, sopkärl, papperskärl, skräpkorg, avfallskorg, skräp, sopor"
@@ -3958,6 +3989,14 @@
                     "name": "Vattenverk",
                     "terms": "Vattenverk, vattenreningsanläggning, vattenreningsverk,\nvattenanläggning, vatten"
                 },
+                "man_made/watermill": {
+                    "name": "Vattenkvarn",
+                    "terms": "Vattenkvarn, kvarn, kvarnhjul, vattenmölla, mölla, skovelhjul, skvalta, skvaltkvarn"
+                },
+                "man_made/windmill": {
+                    "name": "Väderkvarn",
+                    "terms": "Väderkvarn, vindmölla, vädemölle, vindkraft, kvarn, mölla"
+                },
                 "man_made/works": {
                     "name": "Fabrik",
                     "terms": "Fabrik, montering, bryggeri, bil, plast, bearbetning, tillverkning, raffinaderi, fabrikstillverkning, industri, verkstad, fabriksbyggnad, monteringsanläggning, bearbetningsanläggning, möbeltillverkning, oljeraffinaderi"
@@ -4242,6 +4281,14 @@
                     "name": "Elgenerator",
                     "terms": "Elgenerator, kraftgenerator, generator, strömtillverkning, kraftkälla"
                 },
+                "power/generator/source_nuclear": {
+                    "name": "Kärnkraftsreaktor",
+                    "terms": "Kärnkraftsreaktor, kärnkraft, reaktor, kärnenergi, atomenergi, atomkraft, atomkraftverk, nukleär energi,kärnkraftverk, kärnkraftvärk, kärnreaktor, kärnanläggning, kärnkraftsanläggning,"
+                },
+                "power/generator/source_wind": {
+                    "name": "Vindturbin",
+                    "terms": "Vindturbin, vindkraft, vindkraftverk, vindmölla"
+                },
                 "power/line": {
                     "name": "Högspänningsledning",
                     "terms": "kraftledning, elledning, högspänningsledning, högspänning"
diff --git a/dist/locales/ta.json b/dist/locales/ta.json
index dc9e4e0c2..e61de3b6f 100644
--- a/dist/locales/ta.json
+++ b/dist/locales/ta.json
@@ -495,9 +495,6 @@
                 "construction": {
                     "label": "வகை"
                 },
-                "content": {
-                    "label": "பொருளடக்கம்"
-                },
                 "country": {
                     "label": "நாடு"
                 },
diff --git a/dist/locales/th.json b/dist/locales/th.json
index 4496d9235..6ea70c458 100644
--- a/dist/locales/th.json
+++ b/dist/locales/th.json
@@ -336,9 +336,6 @@
                 "contact/webcam": {
                     "placeholder": "http://example.com/"
                 },
-                "content": {
-                    "label": "เนื้อหา"
-                },
                 "currency_multi": {
                     "label": "ชนิดเงินตรา"
                 },
diff --git a/dist/locales/tl.json b/dist/locales/tl.json
index faf2703c7..6c29e1437 100644
--- a/dist/locales/tl.json
+++ b/dist/locales/tl.json
@@ -850,9 +850,6 @@
                     "label": "URL ng webcam",
                     "placeholder": "http://example.com/"
                 },
-                "content": {
-                    "label": "Mga nilalaman"
-                },
                 "country": {
                     "label": "bansa"
                 },
diff --git a/dist/locales/tr.json b/dist/locales/tr.json
index 9dc4f87a4..0d0e22968 100644
--- a/dist/locales/tr.json
+++ b/dist/locales/tr.json
@@ -1226,9 +1226,6 @@
                     "label": "Webcam Adresi",
                     "placeholder": "http://example.com/"
                 },
-                "content": {
-                    "label": "İçerik"
-                },
                 "country": {
                     "label": "Ülke"
                 },
diff --git a/dist/locales/uk.json b/dist/locales/uk.json
index d4cd01e8f..7d86d6a10 100644
--- a/dist/locales/uk.json
+++ b/dist/locales/uk.json
@@ -1357,9 +1357,6 @@
                     "label": "URL веб-камери",
                     "placeholder": "http://example.com/"
                 },
-                "content": {
-                    "label": "Вміст"
-                },
                 "country": {
                     "label": "Країна"
                 },
diff --git a/dist/locales/vi.json b/dist/locales/vi.json
index 6ad040c5b..0ec939948 100644
--- a/dist/locales/vi.json
+++ b/dist/locales/vi.json
@@ -1262,9 +1262,6 @@
                     "label": "URL Webcam",
                     "placeholder": "http://example.com/"
                 },
-                "content": {
-                    "label": "Đồ Chứa đựng"
-                },
                 "country": {
                     "label": "Quốc gia"
                 },
diff --git a/dist/locales/yue.json b/dist/locales/yue.json
index a1f2e4c5e..bb8ceb8d0 100644
--- a/dist/locales/yue.json
+++ b/dist/locales/yue.json
@@ -2,7 +2,7 @@
     "yue": {
         "modes": {
             "add_area": {
-                "title": "範圍",
+                "title": "範圍Up",
                 "description": "加公園、建築物、湖或者其他範圍入去地圖度。",
                 "tail": "喺地圖度撳一下就可以開始畫範圍，好似公園呀、湖呀、或者建築物呀咁。"
             },
@@ -101,12 +101,25 @@
             },
             "delete": {
                 "title": "刪",
+                "description": {
+                    "single": "刪走此地貌，從此消失。",
+                    "multiple": "刪走此等地貌，從此消失。"
+                },
                 "annotation": {
                     "point": "刪咗處。",
                     "vertex": "道度刪咗節。",
                     "line": "刪咗綫。",
                     "area": "刪咗範圍。",
-                    "relation": "刪咗關聯。"
+                    "relation": "刪咗關聯。",
+                    "multiple": "刪走 {n} 地貌。"
+                },
+                "too_large": {
+                    "single": "此地貌不得刪走，皆因依家見到部份唔夠數。",
+                    "multiple": "此等地貌不得刪走，皆因依家見到部份唔夠數。"
+                },
+                "incomplete_relation": {
+                    "single": "此地貌不得刪走，皆因佢未傳晒落來。",
+                    "multiple": "此等地貌不得刪走，皆因佢哋未傳晒落來。"
                 }
             },
             "add_member": {
@@ -150,6 +163,16 @@
                     "vertex": "道度搬咗節。",
                     "line": "搬咗條綫。",
                     "area": "搬咗範圍。"
+                },
+                "incomplete_relation": {
+                    "single": "此地貌冇得搬，皆因佢未傳晒落來。",
+                    "multiple": "此等地貌冇得搬，皆因佢哋未傳晒落來。"
+                }
+            },
+            "reflect": {
+                "key": {
+                    "long": "T",
+                    "short": "Y"
                 }
             },
             "rotate": {
@@ -227,9 +250,12 @@
             "readonly": "程式接口，只讀不寫。你要等下先記到你修改。"
         },
         "commit": {
+            "title": "傳上去公家街圖",
             "description_placeholder": "簡述你做過啲乜（必填）",
+            "message_label": "變更留言",
             "upload_explanation": "你嘅修改，傳咗上去公家街圖。凢用公家街圖資料，地圖都會見到。",
             "upload_explanation_with_user": "你以{user}名義，修改傳咗上去公家街圖。凢用公家街圖資料，地圖都會見到。",
+            "save": "傳上",
             "cancel": "唔記",
             "changes": "變更 {count} 個",
             "warnings": "警告",
@@ -245,6 +271,17 @@
             "list": "有{users}修改",
             "truncated_list": "有{users}同另外{count}人修改"
         },
+        "info_panels": {
+            "key": "I",
+            "background": {
+                "key": "B"
+            },
+            "history": {
+                "last_edit": "最近修改",
+                "edited_by": "修改人為",
+                "changeset": "變更"
+            }
+        },
         "geometry": {
             "point": "點",
             "vertex": "頂點",
@@ -390,10 +427,12 @@
         },
         "save": {
             "title": "記低",
+            "help": "重閱所變更，傳上公家街圖，等其他用者睇到。",
             "no_changes": "無修改可記",
             "error": "記低途中有錯。",
             "status_code": "服務電腦回覆狀況代號 {code}",
             "unknown_error_details": "請確保你上到互聯網",
+            "uploading": "傳緊改動上公家街圖",
             "unsaved_changes": "你有修改未記妥",
             "conflict": {
                 "header": "調解相衝修改",
@@ -404,7 +443,7 @@
                 "keep_remote": "用佢",
                 "restore": "囘復",
                 "delete": "由佢唔要",
-                "download_changes": "或者下載你改嘅。",
+                "download_changes": "或者傳你改嘅落來。",
                 "done": "衝突通通解決！"
             }
         },
@@ -474,7 +513,8 @@
         },
         "help": {
             "title": "指南",
-            "help": "# 指南\n\n爾個編器，係爲 [公家街圖](http://www.openstreetmap.org/)而做。 有世界地圖，任用亦改得。你可以用佢，喺你處加嘢改嘢。如此一來，裏面嘅料，人人可以公開任用，人人得益。\n\n邊個用公家街圖，都見得到你整嘅地圖。要改得到，就要開定個\n[簽入戶口](https://www.openstreetmap.org/login).\n\n[iD editor](http://ideditor.com/) 係合作而成， [程式碼放喺 GitHub](https://github.com/openstreetmap/iD).\n",
+            "help": "# 指南\n\n爾個程式，係爲 [公家街圖](http://www.openstreetmap.org/)而做。 有世界地圖，任用亦改得。你可以用佢，喺你處加嘢改嘢。如此一來，裏面嘅料，人人可以公開任用，人人得益。\n\n邊個用公家街圖，都見得到你整嘅地圖。要改得到，就要開定個\n[簽入戶口](https://www.openstreetmap.org/login).\n\n[iD editor](http://ideditor.com/) 係合作而成， [程式碼放喺 GitHub](https://github.com/openstreetmap/iD).\n",
+            "editing_saving": "# 編寫與記低\n\n爾個程式，主要係上網改，就係你如今去緊網站。\n\n### 㨂地貌\n\n要揀地貌，好似路同名勝咁，撳落地圖。揀咗嘅就會上色，開個版面，\n內有佢明細，亦會有個表單，你可以同地貌做乜。\n\n揀幾個地貌，撳住「Shift」掣。跟住，一係滑鼠撳落地貌你所揀，或者地圖上拖佢，\n畫長方形。咁會有個格，同埋揀咗格內所有點。\n\n### 記低修改\n\n你改路改樓改地方，只係記喺你部機度，直至你記上網度。錯咗唔使慌，\n你可以退返改左嘅，撳一退回掣就得，或者再做返個修改，都係撳一下重做掣。\n\n撳「記低」，完成成組修改，即係，你改完城一部份，想做另一部份。你有機\n去睇返改過乜，程式會畀啲建議你，或者，若果有唔妥提出警告。\n\n若果睇落幾好，你就打句短評，解釋下你改乜，然後再撳「記低」放上網，放上\n[OpenStreetMap.org](http://www.openstreetmap.org/)，咁樣呢，修改就睇得見。\n其他人可以再改再改再改善。\n\n你一次未改好，可以留畀程，下次返來改（只要同機同瀏覧器）。咁樣，程式\n會繼續返。\n\n### 用程式\n\n你想睇鍵盤快掣，就咁下「?」掣。\n",
             "roads": "# 路\n\n用個程式，你開得，整得，刪得啲路。路有幾種，徑、公路、山徑、單車徑等等，乜嘢相交一段都要畫面出來。\n\n### 揀\n\n撳一下條路，就揀到。個外形會見得明顯，亦有架生仔選單，外加邊註欄有多啲路嘅資料。\n\n### 改\n\n你耐不耐見到條路，同背景相，或全球定位系統行縱，並唔一致。你要調較到佢哋啱位。\n\n首先撳一下，你想改嗰條路。咁條路就會特別顯眼，同埋有一點點畀你畀拉到啱位。若你想加多幾點，更加仔細，就喺條路上面，無節嘅地方，快撳兩下，咁就會開多一節。\n\n若然條路要駁去其他路，之但係無駁妥，咁你就拖住一點，拉到其他路，整到聯埋。地圖來講，駁通啲路係咁緊要，同埋駕車搵路亦必須。\n\n你亦可以用【搬】爾個架生，或撳快掣【M】，一次過搬成條路，再撳多下，就記好搬動。\n\n### 刪\n\n若成條路都唔啱，你亦要望下衞星相，以及最好親身確認，佢真係唔喺度，你就可以刪咗佢，卽係由地圖度搬走。小心啲刪走地貌，同其他改法一樣，有時地貌係人人都見到，但係衞星相過晒時，新路未必見。\n\n你刪條路，就撳佢一下，揀咗佢。跟住撳垃圾筒公仔，或者撳快掣【Delete】。\n\n### 開新\n\n要搵地方，緊係要有條路，係咪？去程式左上角，咁住【綫】個公仔，或者撳快掣【2】，就開始畫綫。\n\n地圖度，撳住路頭個位開始畫。若然條路由原路分出，就由原路上面路口位，撳一下開始。\n\n撳嘅點，應該人係跟實條路，跟䘙星相，或跟全球定位系統行蹤。若果你條路，會橫過另一條，你就喺路口位，撳落另一條路上，就起咗個交叉點。你要畫完，就快撳兩下。又或者咁鍵盤【Return】或【Enter】掣。\n",
             "gps": "# 全球定位系統\n\n數據取自全球定位系統，係公家街圖至可靠來源。爾個造圖程式，用到本機行蹤，卽放你電腦嘅【.gpx】檔案。你收集全球定位系統行蹤，取自智能電話程式，或者個人全球定位系統儀。\n\n點去用全球定位系統測量，睇下 [製圖，用電話、用全球定位系統、用紙](http://learnosm.org/en/mobile-mapping/)。\n\n用GPX途徑製圖，拖GPX檔案落造圖程式。若然讀得明，佢會加入地圖，用鮮紫綫顯現。喺右邊，撳落【背景設定】選單。咁就開得，閂得，放大縮細新嘅GPX層。\n\n爾個GPX途徑，唔會直上公家街圖，最好用法，就係用佢製圖。按此加新地貌，亦可[傳上公家街圖](http://www.openstreetmap.org/trace/create)以作其他用途。\n",
             "imagery": "# 相\n\n航空相係地圖要源。佢哋飛機飛過，衞星望落等組合。網上有任用來源，可供使用。就喺右邊，【背景設定】之內。\n\n程式預先已有 [兵地圖](http://www.bing.com/maps/) 䘙星相層。你放大縮細去某啲地方，就有其他可用。某幾國，如美國、法國、丹麥等，國內某啲地方，有極精細嘅相。\n\n相有時同地圖資料有差距，爾個係供相者出錯。若你睇到多多路與背景移咗位，就唔好郁住。將啲相校好個位，同地圖資料吻合。要咁做，就去背景設定，撳【校正對位誤差】校好咗先。\n",
@@ -512,14 +552,27 @@
             },
             "startediting": {
                 "title": "開始改",
+                "shortcuts": "撳下「{key}」掣，你可睇下連串命令，同埋佢嘅鍵盤快掣。",
                 "save": "記得定時記低修改！",
                 "start": "開始制圖"
             }
         },
+        "shortcuts": {
+            "title": "鍵盤快掣",
+            "tooltip": "螢幕上睇到鍵盤快掣",
+            "browsing": {
+                "help": {
+                    "keyboard": "睇鍵盤快掣"
+                }
+            },
+            "tools": {
+                "title": "架生"
+            }
+        },
         "presets": {
             "categories": {
                 "category-barrier": {
-                    "name": "阻擋地貌"
+                    "name": "屏障地貌"
                 },
                 "category-building": {
                     "name": "屋宇地貌"
@@ -530,6 +583,15 @@
                 "category-landuse": {
                     "name": "用地地貌"
                 },
+                "category-natural-area": {
+                    "name": "天然地貌"
+                },
+                "category-natural-line": {
+                    "name": "天然地貌"
+                },
+                "category-natural-point": {
+                    "name": "天然地貌"
+                },
                 "category-path": {
                     "name": "徑地貌"
                 },
@@ -603,10 +665,17 @@
                 "address": {
                     "label": "地埗",
                     "placeholders": {
+                        "block_number": "座數",
+                        "block_number!jp": "座數",
                         "city": "城",
+                        "city!jp": "城／鎮／村／東京都區部",
+                        "city!vn": "城／鎮",
                         "conscriptionnumber": "一百二十三號",
                         "country": "國",
+                        "county": "郡縣",
+                        "county!jp": "區",
                         "district": "區",
+                        "district!vn": "法國之縣／鎮／區",
                         "floor": "樓數",
                         "hamlet": "村仔",
                         "housename": "屋名",
@@ -714,6 +783,9 @@
                 "building_area": {
                     "label": "屋宇"
                 },
+                "camera/direction": {
+                    "placeholder": "45, 90, 180, 270"
+                },
                 "capacity": {
                     "label": "容納",
                     "placeholder": "50, 100, 200..."
@@ -739,6 +811,9 @@
                         "WSW": "西南偏西"
                     }
                 },
+                "castle_type": {
+                    "label": "類"
+                },
                 "clock_direction": {
                     "label": "方向",
                     "options": {
@@ -746,15 +821,15 @@
                         "clockwise": "順時針"
                     }
                 },
+                "club": {
+                    "label": "類"
+                },
                 "collection_times": {
                     "label": "收集時間"
                 },
                 "construction": {
                     "label": "類"
                 },
-                "content": {
-                    "label": "內容"
-                },
                 "country": {
                     "label": "國"
                 },
@@ -801,7 +876,7 @@
                             "title": "共用單車道"
                         },
                         "track": {
-                            "description": "單車道與交通有阻隔",
+                            "description": "單車道與交通有屏障",
                             "title": "單連分徑"
                         }
                     },
@@ -851,6 +926,10 @@
                 "elevation": {
                     "label": "海拔"
                 },
+                "email": {
+                    "label": "電郵",
+                    "placeholder": "example@example.com"
+                },
                 "emergency": {
                     "label": "急症室"
                 },
@@ -867,6 +946,9 @@
                 "fee": {
                     "label": "費用"
                 },
+                "fence_type": {
+                    "label": "類"
+                },
                 "fire_hydrant/type": {
                     "label": "類",
                     "options": {
@@ -917,6 +999,9 @@
                 "handrail": {
                     "label": "扶手"
                 },
+                "height": {
+                    "label": "高（米）"
+                },
                 "highway": {
                     "label": "類"
                 },
@@ -1033,6 +1118,12 @@
                 "man_made": {
                     "label": "類"
                 },
+                "manhole": {
+                    "label": "類"
+                },
+                "map_type": {
+                    "label": "類"
+                },
                 "maxspeed": {
                     "label": "限速",
                     "placeholder": "40, 50, 60..."
@@ -1723,7 +1814,7 @@
                     "terms": "Area,區域,範圍"
                 },
                 "barrier": {
-                    "name": "阻擋",
+                    "name": "屏障",
                     "terms": "Barrier,屏障,阻擋,障礙,障礙物"
                 },
                 "barrier/block": {
@@ -2882,6 +2973,40 @@
                     "terms": "Weir,堤堰,堤壩,堰,壩,壆"
                 }
             }
+        },
+        "imagery": {
+            "Bing": {
+                "description": "衞星同般空相。",
+                "name": "必應般空相"
+            },
+            "DigitalGlobe-Premium": {
+                "attribution": {
+                    "text": "條款同回應"
+                },
+                "description": "數碼地球，特等衞星相。",
+                "name": "數碼地球特等相。"
+            },
+            "DigitalGlobe-Standard": {
+                "attribution": {
+                    "text": "條款同回應"
+                },
+                "description": "數碼地球，一般衞星相。",
+                "name": "數碼地球一般相。"
+            },
+            "MAPNIK": {
+                "attribution": {
+                    "text": "版權所有，公家街圖協力人。共創之下，任發任改，然而必須提及協力者，改咗必以同樣條款發放。"
+                },
+                "description": "預設公家街圖層",
+                "name": "公家街圖（一般）"
+            },
+            "Mapbox": {
+                "attribution": {
+                    "text": "條款同回應"
+                },
+                "description": "衞星同般空相。",
+                "name": "輿圖盒衛星"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/dist/locales/zh-CN.json b/dist/locales/zh-CN.json
index e6503dbd3..feb3cff82 100644
--- a/dist/locales/zh-CN.json
+++ b/dist/locales/zh-CN.json
@@ -2,8 +2,8 @@
     "zh-CN": {
         "modes": {
             "add_area": {
-                "title": "面",
-                "description": "添加公园、建筑物、湖泊或其他面到地图上。",
+                "title": "区域",
+                "description": "在地图上添加公园、建筑物、湖泊或其他区域。",
                 "tail": "在地图上单击开始绘制面状要素，如公园、湖泊或建筑物。"
             },
             "add_line": {
@@ -341,11 +341,11 @@
             "created": "已创建",
             "about_changeset_comments": "关于修改集合说明",
             "about_changeset_comments_link": "//wiki.openstreetmap.org/wiki/Good_changeset_comments",
-            "google_warning": "您在评论中提及Google: 注意从Google地图抄袭是严格禁止的。",
+            "google_warning": "您在该评论中提及 Google : 记住复制 Google Maps 中信息是严格禁止的。",
             "google_warning_link": "http://www.openstreetmap.org/copyright"
         },
         "contributors": {
-            "list": "{users}编辑",
+            "list": "{users} 编辑",
             "truncated_list": "{users}及另外{count}人编辑"
         },
         "info_panels": {
@@ -460,6 +460,7 @@
             "switch": "切换回该底图",
             "custom": "自定义",
             "custom_button": "编辑自定义背景",
+            "custom_prompt": "输入地图影像的URL模版。有效的参数包括：\n以Z/X/Y方式的服务器使用 {zoom}, {z},{x}, {y} 作为参数，\n以TMS风格翻转Y坐标方式的服务器，使用{ty} 作为参数\n以quadtile方式的服务器，使用 {u} 作参数。\n以复用DNS方式的服务器，使用{switch:a,b,c}作为参数\n\n例如：{example}",
             "fix_misalignment": "调整影像偏移",
             "imagery_source_faq": "该影像的来源是？",
             "reset": "重置",
@@ -1356,9 +1357,6 @@
                     "label": "网络摄像机地址",
                     "placeholder": "http://example.com/"
                 },
-                "content": {
-                    "label": "内容"
-                },
                 "country": {
                     "label": "国家"
                 },
diff --git a/dist/locales/zh-HK.json b/dist/locales/zh-HK.json
index fb151e27c..a5370d208 100644
--- a/dist/locales/zh-HK.json
+++ b/dist/locales/zh-HK.json
@@ -1027,9 +1027,6 @@
                     "label": "網路相機 URL",
                     "placeholder": "http://example.com/"
                 },
-                "content": {
-                    "label": "內容"
-                },
                 "country": {
                     "label": "國"
                 },
diff --git a/dist/locales/zh-TW.json b/dist/locales/zh-TW.json
index 33ec562b2..be611fc3d 100644
--- a/dist/locales/zh-TW.json
+++ b/dist/locales/zh-TW.json
@@ -1341,6 +1341,9 @@
                         "clockwise": "順時針"
                     }
                 },
+                "clothes": {
+                    "label": "服飾"
+                },
                 "club": {
                     "label": "類型"
                 },
@@ -1527,6 +1530,10 @@
                 "generator/method": {
                     "label": "方法"
                 },
+                "generator/output/electricity": {
+                    "label": "電力輸出",
+                    "placeholder": "50 MW, 100 MW, 200 MW..."
+                },
                 "generator/source": {
                     "label": "來源"
                 },
@@ -1891,6 +1898,10 @@
                 "plant": {
                     "label": "電廠"
                 },
+                "plant/output/electricity": {
+                    "label": "電力輸出",
+                    "placeholder": "500 MW, 1000 MW, 2000 MW..."
+                },
                 "population": {
                     "label": "人口數"
                 },
@@ -2570,6 +2581,10 @@
                     "name": "教堂",
                     "terms": "教堂,教會"
                 },
+                "amenity/place_of_worship/hindu": {
+                    "name": "印度寺廟",
+                    "terms": "印度寺廟"
+                },
                 "amenity/place_of_worship/jewish": {
                     "name": "猶太教堂",
                     "terms": "猶太會堂,synagogue"
@@ -2578,6 +2593,18 @@
                     "name": "清真寺",
                     "terms": "清真寺,回教寺"
                 },
+                "amenity/place_of_worship/shinto": {
+                    "name": "神社",
+                    "terms": "神社,日本神社"
+                },
+                "amenity/place_of_worship/sikh": {
+                    "name": "錫克教寺廟",
+                    "terms": "錫克教寺廟"
+                },
+                "amenity/place_of_worship/taoist": {
+                    "name": "道教寺廟",
+                    "terms": "道教寺廟"
+                },
                 "amenity/planetarium": {
                     "name": "天文臺",
                     "terms": "天文臺,天文台,觀象台"
@@ -2743,6 +2770,10 @@
                     "name": "獸醫院",
                     "terms": "獸醫診所, 動物醫院"
                 },
+                "amenity/waste/dog_excrement": {
+                    "name": "狗排洩物箱",
+                    "terms": "<translate with synonyms or related terms for 'Dog Excrement Bin', separated by commas>"
+                },
                 "amenity/waste_basket": {
                     "name": "垃圾筒",
                     "terms": "廢物箱,垃圾箱"
@@ -3958,6 +3989,14 @@
                     "name": "淨水廠",
                     "terms": "水務設施"
                 },
+                "man_made/watermill": {
+                    "name": "水力磨坊",
+                    "terms": "水力磨坊"
+                },
+                "man_made/windmill": {
+                    "name": "風力磨坊",
+                    "terms": "風力磨坊"
+                },
                 "man_made/works": {
                     "name": "工廠",
                     "terms": "工廠,加工廠,Factory"
@@ -4242,6 +4281,14 @@
                     "name": "發電機",
                     "terms": "發電機"
                 },
+                "power/generator/source_nuclear": {
+                    "name": "核子反應爐",
+                    "terms": "核子反應爐,核反應爐,核電廠"
+                },
+                "power/generator/source_wind": {
+                    "name": "風力發電機",
+                    "terms": "風力發電機"
+                },
                 "power/line": {
                     "name": "電纜",
                     "terms": "電線"
diff --git a/modules/behavior/hash.js b/modules/behavior/hash.js
index 7d0626680..431594a7c 100644
--- a/modules/behavior/hash.js
+++ b/modules/behavior/hash.js
@@ -99,7 +99,7 @@ export function behaviorHash(context) {
                 context.storage('commentDate', Date.now());
             }
 
-            if (q.walkthrough) {
+            if (q.walkthrough === 'true') {
                 hash.startWalkthrough = true;
             }
 
diff --git a/modules/core/context.js b/modules/core/context.js
index ca0ac127e..1acc4f96b 100644
--- a/modules/core/context.js
+++ b/modules/core/context.js
@@ -24,7 +24,7 @@ export function setAreaKeys(value) {
 
 export function coreContext() {
     var context = {};
-    context.version = '2.3.1';
+    context.version = '2.3.2';
 
     // create a special translation that contains the keys in place of the strings
     var tkeys = _.cloneDeep(dataEn);
@@ -88,7 +88,9 @@ export function coreContext() {
     }
 
     context.preauth = function(options) {
-        connection.switch(options);
+        if (connection) {
+            connection.switch(options);
+        }
         return context;
     };
 
@@ -97,7 +99,9 @@ export function coreContext() {
             entitiesLoaded(err, result);
             if (callback) callback(err, result);
         }
-        connection.loadTiles(projection, dimensions, done);
+        if (connection) {
+            connection.loadTiles(projection, dimensions, done);
+        }
     };
 
     context.loadEntity = function(id, callback) {
@@ -105,7 +109,9 @@ export function coreContext() {
             entitiesLoaded(err, result);
             if (callback) callback(err, result);
         }
-        connection.loadEntity(id, done);
+        if (connection) {
+            connection.loadEntity(id, done);
+        }
     };
 
     context.zoomToEntity = function(id, zoomTo) {
@@ -136,7 +142,9 @@ export function coreContext() {
     context.minEditableZoom = function(_) {
         if (!arguments.length) return minEditableZoom;
         minEditableZoom = _;
-        connection.tileZoom(_);
+        if (connection) {
+            connection.tileZoom(_);
+        }
         return context;
     };
 
diff --git a/modules/core/history.js b/modules/core/history.js
index 7c53e55b0..7c69eaa76 100644
--- a/modules/core/history.js
+++ b/modules/core/history.js
@@ -454,6 +454,7 @@ export function coreHistory(context) {
                     // When we restore a modified way, we also need to fetch any missing
                     // childnodes that would normally have been downloaded with it.. #2142
                     if (loadChildNodes) {
+                        var osm = context.connection();
                         var missing =  _(baseEntities)
                                 .filter({ type: 'way' })
                                 .map('nodes')
@@ -462,7 +463,7 @@ export function coreHistory(context) {
                                 .reject(function(n) { return stack[0].graph.hasEntity(n); })
                                 .value();
 
-                        if (!_.isEmpty(missing)) {
+                        if (!_.isEmpty(missing) && osm) {
                             loadComplete = false;
                             context.redrawEnable(false);
 
@@ -480,8 +481,7 @@ export function coreHistory(context) {
 
                                     // fetch older versions of nodes that were deleted..
                                     _.each(visible.false, function(entity) {
-                                        context.connection()
-                                            .loadEntityVersion(entity.id, +entity.version - 1, childNodesLoaded);
+                                        osm.loadEntityVersion(entity.id, +entity.version - 1, childNodesLoaded);
                                     });
                                 }
 
@@ -492,7 +492,7 @@ export function coreHistory(context) {
                                 }
                             };
 
-                            context.connection().loadMultiple(missing, childNodesLoaded);
+                            osm.loadMultiple(missing, childNodesLoaded);
                         }
                     }
                 }
diff --git a/modules/index.js b/modules/index.js
index 7b79ecf9f..e14719f0e 100644
--- a/modules/index.js
+++ b/modules/index.js
@@ -37,6 +37,7 @@ export { rendererFeatures as Features } from './renderer/features';
 export { rendererMap as Map } from './renderer/map';
 export { rendererTileLayer as TileLayer } from './renderer/tile_layer';
 export { utilDetect as Detect } from './util/detect';
+export { uiPresetEditor as uiPreset } from './ui/preset_editor';
 
 export var debug = false;
 
diff --git a/modules/modes/save.js b/modules/modes/save.js
index 27a70ebca..766f66779 100644
--- a/modules/modes/save.js
+++ b/modules/modes/save.js
@@ -35,8 +35,8 @@ export function modeSave(context) {
     };
 
     var commit = uiCommit(context)
-            .on('cancel', cancel)
-            .on('save', save);
+        .on('cancel', cancel)
+        .on('save', save);
 
 
     function cancel() {
@@ -46,7 +46,8 @@ export function modeSave(context) {
 
     function save(changeset, tryAgain) {
 
-        var loading = uiLoading(context).message(t('save.uploading')).blocking(true),
+        var osm = context.connection(),
+            loading = uiLoading(context).message(t('save.uploading')).blocking(true),
             history = context.history(),
             origChanges = history.changes(actionDiscardTags(history.difference())),
             localGraph = context.graph(),
@@ -57,6 +58,8 @@ export function modeSave(context) {
             conflicts = [],
             errors = [];
 
+        if (!osm) return;
+
         if (!tryAgain) {
             history.perform(actionNoop());  // checkpoint
         }
@@ -64,7 +67,7 @@ export function modeSave(context) {
         context.container().call(loading);
 
         if (toCheck.length) {
-            context.connection().loadMultiple(toLoad, loaded);
+            osm.loadMultiple(toLoad, loaded);
         } else {
             upload();
         }
@@ -119,7 +122,7 @@ export function modeSave(context) {
 
                 if (loadMore.length) {
                     toLoad.push.apply(toLoad, loadMore);
-                    context.connection().loadMultiple(loadMore, loaded);
+                    osm.loadMultiple(loadMore, loaded);
                 }
 
                 if (!toLoad.length) {
@@ -134,7 +137,7 @@ export function modeSave(context) {
                 return { id: id, text: text, action: function() { history.replace(action); } };
             }
             function formatUser(d) {
-                return '<a href="' + context.connection().userURL(d) + '" target="_blank">' + d + '</a>';
+                return '<a href="' + osm.userURL(d) + '" target="_blank">' + d + '</a>';
             }
             function entityName(entity) {
                 return utilDisplayName(entity) || (utilDisplayType(entity.id) + ' ' + entity.id);
@@ -201,7 +204,7 @@ export function modeSave(context) {
             } else {
                 var changes = history.changes(actionDiscardTags(history.difference()));
                 if (changes.modified.length || changes.created.length || changes.deleted.length) {
-                    context.connection().putChangeset(changeset, changes, uploadCallback);
+                    osm.putChangeset(changeset, changes, uploadCallback);
                 } else {        // changes were insignificant or reverted by user
                     d3.select('.inspector-wrap *').remove();
                     loading.close();
@@ -360,10 +363,13 @@ export function modeSave(context) {
         context.container().selectAll('#content')
             .attr('class', 'inactive');
 
-        if (context.connection().authenticated()) {
+        var osm = context.connection();
+        if (!osm) return;
+
+        if (osm.authenticated()) {
             done();
         } else {
-            context.connection().authenticate(function(err) {
+            osm.authenticate(function(err) {
                 if (err) {
                     cancel();
                 } else {
diff --git a/modules/osm/tags.js b/modules/osm/tags.js
index 37fc8434a..77905a201 100644
--- a/modules/osm/tags.js
+++ b/modules/osm/tags.js
@@ -48,7 +48,9 @@ export var osmPavedTags = {
     'surface': {
         'paved': true,
         'asphalt': true,
-        'concrete': true
+        'concrete': true,
+        'concrete:lanes': true,
+        'concrete:plates': true
     },
     'tracktype': {
         'grade1': true
diff --git a/modules/osm/way.js b/modules/osm/way.js
index 99ccc3716..4a6862230 100644
--- a/modules/osm/way.js
+++ b/modules/osm/way.js
@@ -152,6 +152,23 @@ _.extend(osmWay.prototype, {
 
 
     isArea: function() {
+        // `highway` and `railway` are typically linear features, but there
+        // are a few exceptions that should be treated as areas, even in the
+        // absence of a proper `area=yes` or `areaKeys` tag.. see #4194
+        var lineKeys = {
+            highway: {
+                rest_area: true,
+                services: true
+            },
+            railway: {
+                roundhouse: true,
+                station: true,
+                traverser: true,
+                turntable: true,
+                wash: true
+            }
+        };
+
         if (this.tags.area === 'yes')
             return true;
         if (!this.isClosed() || this.tags.area === 'no')
@@ -160,6 +177,9 @@ _.extend(osmWay.prototype, {
             if (key in areaKeys && !(this.tags[key] in areaKeys[key])) {
                 return true;
             }
+            if (key in lineKeys && this.tags[key] in lineKeys[key]) {
+                return true;
+            }
         }
         return false;
     },
diff --git a/modules/renderer/background.js b/modules/renderer/background.js
index ab98e186d..5fc5286de 100644
--- a/modules/renderer/background.js
+++ b/modules/renderer/background.js
@@ -76,7 +76,9 @@ export function rendererBackground(context) {
             delete q.offset;
         }
 
-        window.location.replace('#' + utilQsString(q, true));
+        if (!window.mocha) {
+            window.location.replace('#' + utilQsString(q, true));
+        }
 
         var imageryUsed = [b.imageryUsed()];
 
@@ -124,6 +126,9 @@ export function rendererBackground(context) {
         if (!arguments.length) return baseLayer.source();
 
         // test source against OSM imagery blacklists..
+        var osm = context.connection();
+        if (!osm) return background;
+
         var blacklists = context.connection().imageryBlacklists();
 
         var template = d.template(),
diff --git a/modules/renderer/map.js b/modules/renderer/map.js
index d94a8dbc6..8e82e12c8 100644
--- a/modules/renderer/map.js
+++ b/modules/renderer/map.js
@@ -1,10 +1,12 @@
 import * as d3 from 'd3';
 import _ from 'lodash';
 import { t } from '../util/locale';
+import { geoExtent } from '../geo';
 
-import { utilRebind } from '../util/rebind';
-import { utilBindOnce } from '../util/bind_once';
-import { utilGetDimensions } from '../util/dimensions';
+import {
+    modeBrowse,
+    modeSelect
+} from '../modes';
 
 import {
     svgAreas,
@@ -14,18 +16,20 @@ import {
     svgMidpoints,
     svgPoints,
     svgVertices
-} from '../svg/index';
+} from '../svg';
 
-import { geoExtent } from '../geo/index';
-import { modeSelect } from '../modes/select';
+import { uiFlash } from '../ui';
 
 import {
     utilFastMouse,
-    utilSetTransform,
-    utilFunctor
-} from '../util/index';
+    utilFunctor,
+    utilRebind,
+    utilSetTransform
+} from '../util';
+
+import { utilBindOnce } from '../util/bind_once';
+import { utilGetDimensions } from '../util/dimensions';
 
-import { uiFlash } from '../ui/index';
 
 
 export function rendererMap(context) {
@@ -69,8 +73,10 @@ export function rendererMap(context) {
         context
             .on('change.map', immediateRedraw);
 
-        context.connection()
-            .on('change.map', immediateRedraw);
+        var osm = context.connection();
+        if (osm) {
+            osm.on('change.map', immediateRedraw);
+        }
 
         context.history()
             .on('change.map', immediateRedraw)
@@ -267,6 +273,7 @@ export function rendererMap(context) {
     function editOff() {
         context.features().resetStats();
         surface.selectAll('.layer-osm *').remove();
+        context.enter(modeBrowse(context));
         dispatch.call('drawn', this, {full: true});
     }
 
diff --git a/modules/services/index.js b/modules/services/index.js
index ea8f600c7..f893714ab 100644
--- a/modules/services/index.js
+++ b/modules/services/index.js
@@ -13,3 +13,12 @@ export var services = {
     wikidata: serviceWikidata,
     wikipedia: serviceWikipedia
 };
+
+export {
+    serviceMapillary,
+    serviceNominatim,
+    serviceOsm,
+    serviceTaginfo,
+    serviceWikidata,
+    serviceWikipedia
+};
diff --git a/modules/ui/account.js b/modules/ui/account.js
index 13c122b47..ec8811ee2 100644
--- a/modules/ui/account.js
+++ b/modules/ui/account.js
@@ -4,17 +4,19 @@ import { svgIcon } from '../svg/index';
 
 
 export function uiAccount(context) {
-    var connection = context.connection();
+    var osm = context.connection();
 
 
     function update(selection) {
-        if (!connection.authenticated()) {
+        if (!osm) return;
+
+        if (!osm.authenticated()) {
             selection.selectAll('#userLink, #logoutLink')
                 .classed('hide', true);
             return;
         }
 
-        connection.userDetails(function(err, details) {
+        osm.userDetails(function(err, details) {
             var userLink = selection.select('#userLink'),
                 logoutLink = selection.select('#logoutLink');
 
@@ -28,7 +30,7 @@ export function uiAccount(context) {
 
             // Link
             userLink.append('a')
-                .attr('href', connection.userURL(details.display_name))
+                .attr('href', osm.userURL(details.display_name))
                 .attr('target', '_blank');
 
             // Add thumbnail or dont
@@ -52,7 +54,7 @@ export function uiAccount(context) {
                 .text(t('logout'))
                 .on('click.logout', function() {
                     d3.event.preventDefault();
-                    connection.logout();
+                    osm.logout();
                 });
         });
     }
@@ -67,9 +69,9 @@ export function uiAccount(context) {
             .attr('id', 'userLink')
             .classed('hide', true);
 
-        connection
-            .on('change.account', function() { update(selection); });
-
-        update(selection);
+        if (osm) {
+            osm.on('change.account', function() { update(selection); });
+            update(selection);
+        }
     };
 }
diff --git a/modules/ui/commit.js b/modules/ui/commit.js
index 7dca44f51..20c20b862 100644
--- a/modules/ui/commit.js
+++ b/modules/ui/commit.js
@@ -26,6 +26,9 @@ export function uiCommit(context) {
 
 
     function commit(selection) {
+        var osm = context.connection();
+        if (!osm) return;
+
         if (!changeset) {
             var detected = utilDetect(),
                 tags = {
@@ -87,7 +90,7 @@ export function uiCommit(context) {
 
         commentField.node().select();
 
-        context.connection().userChangesets(function (err, changesets) {
+        osm.userChangesets(function (err, changesets) {
             if (err) return;
 
             var comments = changesets.map(function(changeset) {
@@ -188,7 +191,7 @@ export function uiCommit(context) {
             .attr('type', 'checkbox')
             .on('change', toggleRequestReview());
 
-        context.connection().userDetails(function(err, user) {
+        osm.userDetails(function(err, user) {
             if (err) return;
 
             var userLink = d3.select(document.createElement('div'));
@@ -204,7 +207,7 @@ export function uiCommit(context) {
                 .append('a')
                 .attr('class','user-info')
                 .text(user.display_name)
-                .attr('href', context.connection().userURL(user.display_name))
+                .attr('href', osm.userURL(user.display_name))
                 .attr('tabindex', -1)
                 .attr('target', '_blank');
 
diff --git a/modules/ui/contributors.js b/modules/ui/contributors.js
index ae09a202a..2a07a5b87 100644
--- a/modules/ui/contributors.js
+++ b/modules/ui/contributors.js
@@ -5,13 +5,16 @@ import { svgIcon } from '../svg/index';
 
 
 export function uiContributors(context) {
-    var debouncedUpdate = _.debounce(function() { update(); }, 1000),
+    var osm = context.connection(),
+        debouncedUpdate = _.debounce(function() { update(); }, 1000),
         limit = 4,
         hidden = false,
         wrap = d3.select(null);
 
 
     function update() {
+        if (!osm) return;
+
         var users = {},
             entities = context.intersects(context.map().extent());
 
@@ -32,7 +35,7 @@ export function uiContributors(context) {
             .enter()
             .append('a')
             .attr('class', 'user-link')
-            .attr('href', function(d) { return context.connection().userURL(d); })
+            .attr('href', function(d) { return osm.userURL(d); })
             .attr('target', '_blank')
             .attr('tabindex', -1)
             .text(String);
@@ -44,7 +47,7 @@ export function uiContributors(context) {
                 .attr('target', '_blank')
                 .attr('tabindex', -1)
                 .attr('href', function() {
-                    return context.connection().changesetsURL(context.map().center(), context.map().zoom());
+                    return osm.changesetsURL(context.map().center(), context.map().zoom());
                 })
                 .text(u.length - limit + 1);
 
@@ -71,10 +74,11 @@ export function uiContributors(context) {
 
 
     return function(selection) {
+        if (!osm) return;
         wrap = selection;
         update();
 
-        context.connection().on('loaded.contributors', debouncedUpdate);
+        osm.on('loaded.contributors', debouncedUpdate);
         context.map().on('move.contributors', debouncedUpdate);
     };
 }
diff --git a/modules/ui/entity_editor.js b/modules/ui/entity_editor.js
index f9abfd139..cb642fe8e 100644
--- a/modules/ui/entity_editor.js
+++ b/modules/ui/entity_editor.js
@@ -10,7 +10,7 @@ import { uiRawMemberEditor } from './raw_member_editor';
 import { uiRawMembershipEditor } from './raw_membership_editor';
 import { uiRawTagEditor } from './raw_tag_editor';
 import { uiTagReference } from './tag_reference';
-import { uiPreset } from './preset';
+import { uiPresetEditor } from './preset_editor';
 import { utilRebind } from '../util';
 
 
@@ -20,18 +20,18 @@ export function uiEntityEditor(context) {
         coalesceChanges = false,
         modified = false,
         base,
-        id,
+        entityId,
         activePreset,
         reference;
 
-    var presetEditor = uiPreset(context)
+    var presetEditor = uiPresetEditor(context)
         .on('change', changeTags);
     var rawTagEditor = uiRawTagEditor(context)
         .on('change', changeTags);
 
 
     function entityEditor(selection) {
-        var entity = context.entity(id),
+        var entity = context.entity(entityId),
             tags = _.clone(entity.tags);
 
         // Header
@@ -63,7 +63,9 @@ export function uiEntityEditor(context) {
             .merge(enter);
 
         header.selectAll('.preset-reset')
-            .on('click', function() { dispatch.call('choose', this, activePreset); });
+            .on('click', function() {
+                dispatch.call('choose', this, activePreset);
+            });
 
 
         // Body
@@ -88,7 +90,7 @@ export function uiEntityEditor(context) {
 
         enter
             .append('div')
-            .attr('class', 'inspector-border inspector-preset');
+            .attr('class', 'inspector-border preset-editor');
 
         enter
             .append('div')
@@ -102,6 +104,12 @@ export function uiEntityEditor(context) {
             .append('div')
             .attr('class', 'raw-membership-editor inspector-inner');
 
+        enter
+            .append('input')
+            .attr('type', 'text')
+            .attr('class', 'key-trap');
+
+
         // Update
         body = body
             .merge(enter);
@@ -113,35 +121,41 @@ export function uiEntityEditor(context) {
             .call(reference.body);
 
         body.selectAll('.preset-reset')
-            .on('click', function() { dispatch.call('choose', this, activePreset); });
+            .on('click', function() {
+                dispatch.call('choose', this, activePreset);
+            });
 
         body.select('.preset-list-item button')
             .call(uiPresetIcon()
-                .geometry(context.geometry(id))
-                .preset(activePreset));
+                .geometry(context.geometry(entityId))
+                .preset(activePreset)
+            );
 
         body.select('.preset-list-item .label')
             .text(activePreset.name());
 
-        body.select('.inspector-preset')
+        body.select('.preset-editor')
             .call(presetEditor
                 .preset(activePreset)
-                .entityID(id)
+                .entityID(entityId)
                 .tags(tags)
-                .state(state));
+                .state(state)
+            );
 
         body.select('.raw-tag-editor')
             .call(rawTagEditor
                 .preset(activePreset)
-                .entityID(id)
+                .entityID(entityId)
                 .tags(tags)
-                .state(state));
+                .state(state)
+            );
 
         if (entity.type === 'relation') {
             body.select('.raw-member-editor')
                 .style('display', 'block')
                 .call(uiRawMemberEditor(context)
-                    .entityID(id));
+                    .entityID(entityId)
+                );
         } else {
             body.select('.raw-member-editor')
                 .style('display', 'none');
@@ -149,8 +163,18 @@ export function uiEntityEditor(context) {
 
         body.select('.raw-membership-editor')
             .call(uiRawMembershipEditor(context)
-                .entityID(id));
+                .entityID(entityId)
+            );
 
+        body.select('.key-trap')
+            .on('keydown.key-trap', function() {
+                // On tabbing, send focus back to the first field on the inspector-body
+                // (probably the `name` field) #4159
+                if (d3.event.keyCode === 9 && !d3.event.shiftKey) {
+                    d3.event.preventDefault();
+                    body.select('input').node().focus();
+                }
+            });
 
         context.history()
             .on('change.entity-editor', historyChanged);
@@ -159,7 +183,7 @@ export function uiEntityEditor(context) {
         function historyChanged() {
             if (state === 'hide') return;
 
-            var entity = context.hasEntity(id),
+            var entity = context.hasEntity(entityId),
                 graph = context.graph();
             if (!entity) return;
 
@@ -211,7 +235,7 @@ export function uiEntityEditor(context) {
     // Tag changes that fire on input can all get coalesced into a single
     // history operation when the user leaves the field.  #2342
     function changeTags(changed, onInput) {
-        var entity = context.entity(id),
+        var entity = context.entity(entityId),
             annotation = t('operations.change_tags.annotation'),
             tags = _.clone(entity.tags);
 
@@ -227,9 +251,9 @@ export function uiEntityEditor(context) {
 
         if (!_.isEqual(entity.tags, tags)) {
             if (coalesceChanges) {
-                context.overwrite(actionChangeTags(id, tags), annotation);
+                context.overwrite(actionChangeTags(entityId, tags), annotation);
             } else {
-                context.perform(actionChangeTags(id, tags), annotation);
+                context.perform(actionChangeTags(entityId, tags), annotation);
                 coalesceChanges = !!onInput;
             }
         }
@@ -252,10 +276,10 @@ export function uiEntityEditor(context) {
 
 
     entityEditor.entityID = function(_) {
-        if (!arguments.length) return id;
-        id = _;
+        if (!arguments.length) return entityId;
+        entityId = _;
         base = context.graph();
-        entityEditor.preset(context.presets().match(context.entity(id), base));
+        entityEditor.preset(context.presets().match(context.entity(entityId), base));
         entityEditor.modified(false);
         coalesceChanges = false;
         return entityEditor;
@@ -266,7 +290,7 @@ export function uiEntityEditor(context) {
         if (!arguments.length) return activePreset;
         if (_ !== activePreset) {
             activePreset = _;
-            reference = uiTagReference(activePreset.reference(context.geometry(id)), context)
+            reference = uiTagReference(activePreset.reference(context.geometry(entityId)), context)
                 .showing(false);
         }
         return entityEditor;
diff --git a/modules/ui/field.js b/modules/ui/field.js
new file mode 100644
index 000000000..148369f1d
--- /dev/null
+++ b/modules/ui/field.js
@@ -0,0 +1,182 @@
+import * as d3 from 'd3';
+import _ from 'lodash';
+import { textDirection } from '../util/locale';
+import { svgIcon } from '../svg';
+import { uiFields } from './fields';
+import { uiTagReference } from './tag_reference';
+import { utilRebind } from '../util';
+
+
+export function uiField(context, presetField, entity, options) {
+    options = _.extend({
+        show: true,
+        wrap: true
+    }, options);
+
+    var dispatch = d3.dispatch('change'),
+        field = _.clone(presetField),
+        state = '',
+        tags = {};
+
+
+    field.impl = uiFields[field.type](field, context)
+        .on('change', function(t, onInput) {
+            dispatch.call('change', field, t, onInput);
+        });
+
+    if (field.impl.entity) {
+        field.impl.entity(entity);
+    }
+
+    field.keys = field.keys || [field.key];
+
+    field.show = options.show;
+
+
+    function isModified() {
+        var original = context.graph().base().entities[entity.id];
+        return _.some(field.keys, function(key) {
+            return original ? tags[key] !== original.tags[key] : tags[key];
+        });
+    }
+
+
+    function isPresent() {
+        return _.some(field.keys, function(key) {
+            return tags[key];
+        });
+    }
+
+
+    function revert(d) {
+        d3.event.stopPropagation();
+        d3.event.preventDefault();
+
+        var original = context.graph().base().entities[entity.id],
+            t = {};
+        d.keys.forEach(function(key) {
+            t[key] = original ? original.tags[key] : undefined;
+        });
+
+        dispatch.call('change', d, t);
+    }
+
+
+    function remove(d) {
+        d3.event.stopPropagation();
+        d3.event.preventDefault();
+
+        var t = {};
+        d.keys.forEach(function(key) {
+            t[key] = undefined;
+        });
+
+        dispatch.call('change', d, t);
+    }
+
+
+    field.render = function(selection) {
+        var container = selection.selectAll('.form-field')
+            .data([field]);
+
+        // Enter
+        var enter = container.enter()
+            .append('div')
+            .attr('class', function(d) { return 'form-field form-field-' + d.id; })
+            .classed('nowrap', !options.wrap);
+
+        if (options.wrap) {
+            var label = enter
+                .append('label')
+                .attr('class', 'form-label')
+                .attr('for', function(d) { return 'preset-input-' + d.id; })
+                .text(function(d) { return d.label(); });
+
+            var wrap = label
+                .append('div')
+                .attr('class', 'form-label-button-wrap');
+
+            wrap
+                .append('button')
+                .attr('class', 'remove-icon')
+                .attr('tabindex', -1)
+                .call(svgIcon('#operation-delete'));
+
+            wrap
+                .append('button')
+                .attr('class', 'modified-icon')
+                .attr('tabindex', -1)
+                .call(
+                    (textDirection === 'rtl') ? svgIcon('#icon-redo') : svgIcon('#icon-undo')
+                );
+        }
+
+
+        // Update
+        container = container
+            .merge(enter);
+
+        container.selectAll('.form-label-button-wrap .remove-icon')
+            .on('click', remove);
+
+        container.selectAll('.form-label-button-wrap .modified-icon')
+            .on('click', revert);
+
+        container
+            .classed('modified', isModified())
+            .classed('present', isPresent())
+            .each(function(d) {
+                if (options.wrap) {
+                    var referenceKey = d.key;
+                    if (d.type === 'multiCombo') {   // lookup key without the trailing ':'
+                        referenceKey = referenceKey.replace(/:$/, '');
+                    }
+                    var reference = uiTagReference(d.reference || { key: referenceKey }, context);
+
+                    if (state === 'hover') {
+                        reference.showing(false);
+                    }
+                }
+
+                d3.select(this)
+                    .call(d.impl);
+
+                if (options.wrap) {
+                    d3.select(this)
+                        .call(reference.body)
+                        .select('.form-label-button-wrap')
+                        .call(reference.button);
+                }
+
+                d.impl.tags(tags);
+            });
+    };
+
+
+    field.state = function(_) {
+        if (!arguments.length) return state;
+        state = _;
+        return field;
+    };
+
+
+    field.tags = function(_) {
+        if (!arguments.length) return tags;
+        tags = _;
+        return field;
+    };
+
+
+    field.isShown = function() {
+        return field.show || _.some(field.keys, function(key) { return !!tags[key]; });
+    };
+
+
+    field.focus = function() {
+        field.impl.focus();
+    };
+
+
+    return utilRebind(field, dispatch, 'on');
+}
+
diff --git a/modules/ui/fields/input.js b/modules/ui/fields/input.js
index 4cbed223a..c60f9361e 100644
--- a/modules/ui/fields/input.js
+++ b/modules/ui/fields/input.js
@@ -1,7 +1,7 @@
 import * as d3 from 'd3';
-import { t } from '../../util/locale';
-import { dataPhoneFormats } from '../../../data/index';
-import { services } from '../../services/index';
+import { t, textDirection } from '../../util/locale';
+import { dataPhoneFormats } from '../../../data';
+import { services } from '../../services';
 import {
     utilGetSetValue,
     utilNoAuto,
@@ -52,6 +52,8 @@ export function uiFieldText(field, context) {
             });
 
         } else if (field.type === 'number') {
+            var rtl = (textDirection === 'rtl');
+
             input.attr('type', 'text');
 
             var spinControl = selection.selectAll('.spin-control')
@@ -63,14 +65,14 @@ export function uiFieldText(field, context) {
 
             enter
                 .append('button')
-                .datum(-1)
-                .attr('class', 'decrement')
+                .datum(rtl ? 1 : -1)
+                .attr('class', rtl ? 'increment' : 'decrement')
                 .attr('tabindex', -1);
 
             enter
                 .append('button')
-                .datum(1)
-                .attr('class', 'increment')
+                .datum(rtl ? -1 : 1)
+                .attr('class', rtl ? 'decrement' : 'increment')
                 .attr('tabindex', -1);
 
             spinControl = spinControl
diff --git a/modules/ui/fields/radio.js b/modules/ui/fields/radio.js
index eca522493..fa4fc4090 100644
--- a/modules/ui/fields/radio.js
+++ b/modules/ui/fields/radio.js
@@ -1,13 +1,7 @@
 import * as d3 from 'd3';
 import { t } from '../../util/locale';
-import { d3combobox } from '../../lib/d3.combobox.js';
-import { services } from '../../services/index';
-
-import {
-    utilGetSetValue,
-    utilNoAuto,
-    utilRebind
-} from '../../util';
+import { uiField } from '../field';
+import { utilRebind } from '../../util';
 
 
 export { uiFieldRadio as uiFieldStructureRadio };
@@ -15,13 +9,12 @@ export { uiFieldRadio as uiFieldStructureRadio };
 
 export function uiFieldRadio(field, context) {
     var dispatch = d3.dispatch('change'),
-        taginfo = services.taginfo,
         placeholder = d3.select(null),
         wrap = d3.select(null),
         labels = d3.select(null),
         radios = d3.select(null),
-        typeInput = d3.select(null),
-        layerInput = d3.select(null),
+        typeField,
+        layerField,
         oldType = {},
         entity;
 
@@ -32,32 +25,6 @@ export function uiFieldRadio(field, context) {
         return !node.empty() && node.datum();
     }
 
-    // returns the tag value for a display value
-    function tagValue(dispVal) {
-        dispVal = snake(clean(dispVal || ''));
-        return dispVal.toLowerCase() || 'yes';
-    }
-
-    // returns the display value for a tag value
-    function displayValue(tagVal) {
-        tagVal = tagVal || '';
-        return tagVal.toLowerCase() === 'yes' ? '' : unsnake(tagVal);
-    }
-
-    function snake(s) {
-        return s.replace(/\s+/g, '_');
-    }
-
-    function unsnake(s) {
-        return s.replace(/_+/g, ' ');
-    }
-
-    function clean(s) {
-        return s.split(';')
-            .map(function(s) { return s.trim(); })
-            .join(';');
-    }
-
 
     function radio(selection) {
         selection.classed('preset-radio', true);
@@ -101,11 +68,16 @@ export function uiFieldRadio(field, context) {
 
         radios = labels.selectAll('input')
             .on('change', changeRadio);
+
     }
 
 
-    function structureExtras(selection) {
-        var selected = selectedKey();
+    function structureExtras(selection, tags) {
+        var selected = selectedKey(),
+            type = context.presets().field(selected),
+            layer = context.presets().field('layer'),
+            showLayer = (selected === 'bridge' || selected === 'tunnel');
+
 
         var extrasWrap = selection.selectAll('.structure-extras-wrap')
                 .data(selected ? [0] : []);
@@ -127,55 +99,67 @@ export function uiFieldRadio(field, context) {
 
 
         // Type
-        var typeItem = list.selectAll('.structure-type-item')
-            .data([0]);
+        if (type) {
+            if (!typeField || typeField.id !== selected) {
+                typeField = uiField(context, type, entity, { wrap: false })
+                    .on('change', changeType);
+            }
+            typeField.tags(tags);
+        } else {
+            typeField = null;
+        }
 
+        var typeItem = list.selectAll('.structure-type-item')
+            .data(typeField ? [typeField] : [], function(d) { return d.id; });
+
+        // Exit
+        typeItem.exit()
+            .remove();
+
+        // Enter
         var typeEnter = typeItem.enter()
-            .append('li')
+            .insert('li', ':first-child')
             .attr('class', 'cf structure-type-item');
 
         typeEnter
             .append('span')
             .attr('class', 'col6 label structure-label-type')
-            .attr('for', 'structure-input-type')
+            .attr('for', 'preset-input-' + selected)
             .text(t('inspector.radio.structure.type'));
 
         typeEnter
             .append('div')
-            .attr('class', 'col6 structure-input-type-wrap')
-            .append('input')
-            .attr('type', 'text')
-            .attr('class', 'structure-input-type')
-            .attr('placeholder', t('inspector.radio.structure.default'))
-            .call(utilNoAuto);
+            .attr('class', 'col6 structure-input-type-wrap');
 
+        // Update
         typeItem = typeItem
             .merge(typeEnter);
 
-        typeInput = typeItem.selectAll('.structure-input-type');
-
-        if (taginfo) {
-            typeInput
-                .call(d3combobox()
-                    .container(context.container())
-                    .fetcher(typeFetcher)
-                );
+        if (typeField) {
+            typeItem.selectAll('.structure-input-type-wrap')
+                .call(typeField.render);
         }
 
-        typeInput
-            .on('change', changeType)
-            .on('blur', changeType);
-
 
         // Layer
-        var showLayer = (selected === 'bridge' || selected === 'tunnel');
+        if (layer && showLayer) {
+            if (!layerField) {
+                layerField = uiField(context, layer, entity, { wrap: false })
+                    .on('change', changeLayer);
+            }
+            layerField.tags(tags);
+        } else {
+            layerField = null;
+        }
 
         var layerItem = list.selectAll('.structure-layer-item')
-            .data(showLayer ? [0] : []);
+            .data(layerField ? [layerField] : []);
 
+        // Exit
         layerItem.exit()
             .remove();
 
+        // Enter
         var layerEnter = layerItem.enter()
             .append('li')
             .attr('class', 'cf structure-layer-item');
@@ -183,87 +167,39 @@ export function uiFieldRadio(field, context) {
         layerEnter
             .append('span')
             .attr('class', 'col6 label structure-label-layer')
-            .attr('for', 'structure-input-layer')
+            .attr('for', 'preset-input-layer')
             .text(t('inspector.radio.structure.layer'));
 
         layerEnter
             .append('div')
-            .attr('class', 'col6 structure-input-layer-wrap')
-            .append('input')
-            .attr('type', 'text')
-            .attr('class', 'structure-input-layer')
-            .attr('placeholder', '0')
-            .call(utilNoAuto);
-
-        var spin = layerEnter
-            .append('div')
-            .attr('class', 'spin-control');
-
-        spin
-            .append('button')
-            .datum(-1)
-            .attr('class', 'decrement')
-            .attr('tabindex', -1);
-
-        spin
-            .append('button')
-            .datum(1)
-            .attr('class', 'increment')
-            .attr('tabindex', -1);
+            .attr('class', 'col6 structure-input-layer-wrap');
 
+        // Update
         layerItem = layerItem
             .merge(layerEnter);
 
-        layerInput = layerItem.selectAll('.structure-input-layer')
-            .on('change', changeLayer)
-            .on('blur', changeLayer);
-
-        layerItem.selectAll('button')
-            .on('click', function(d) {
-                d3.event.preventDefault();
-                var num = parseInt(layerInput.node().value || 0, 10);
-                if (!isNaN(num)) layerInput.node().value = num + d;
-                changeLayer();
-            });
-
+        if (layerField) {
+            layerItem.selectAll('.structure-input-layer-wrap')
+                .call(layerField.render);
+        }
     }
 
 
-    function typeFetcher(q, callback) {
-        taginfo.values({
-            debounce: true,
-            key: selectedKey(),
-            query: q
-        }, function(err, data) {
-            if (err) return;
-            var comboData = data.map(function(d) {
-                return {
-                    key: d.value,
-                    value: unsnake(d.value),
-                    title: d.title
-                };
-            });
-            if (callback) callback(comboData);
-        });
-    }
-
-
-    function changeType() {
-        var key = selectedKey(),
-            t = {};
-
+    function changeType(t, onInput) {
+        var key = selectedKey();
         if (!key) return;
-        var val = tagValue(utilGetSetValue(typeInput));
-        t[key] = val;
+
+        var val = t[key];
         if (val !== 'no') oldType[key] = val;
-        dispatch.call('change', this, t);
+        dispatch.call('change', this, t, onInput);
     }
 
 
-    function changeLayer() {
-        // note: don't use utilGetSetValue here because we want 0 to be falsy.
-        var t = { layer: layerInput.node().value || undefined };
-        dispatch.call('change', this, t);
+    function changeLayer(t, onInput) {
+        if (t.layer === '0') {
+            t.layer = undefined;
+        }
+        dispatch.call('change', this, t, onInput);
     }
 
 
@@ -314,19 +250,16 @@ export function uiFieldRadio(field, context) {
         radios.property('checked', checked);
 
         var selection = radios.filter(function() { return this.checked; });
-        var typeVal = '';
 
         if (selection.empty()) {
             placeholder.text(t('inspector.none'));
         } else {
             placeholder.text(selection.attr('value'));
-            typeVal = oldType[selection.datum()] = tags[selection.datum()];
+            oldType[selection.datum()] = tags[selection.datum()];
         }
 
         if (field.type === 'structureRadio') {
-            wrap.call(structureExtras);
-            utilGetSetValue(typeInput, displayValue(typeVal) || '');
-            utilGetSetValue(layerInput, tags.layer || '');
+            wrap.call(structureExtras, tags);
         }
     };
 
diff --git a/modules/ui/index.js b/modules/ui/index.js
index 76dd5fd31..3abe1ebb2 100644
--- a/modules/ui/index.js
+++ b/modules/ui/index.js
@@ -13,6 +13,7 @@ export { uiEditMenu } from './edit_menu';
 export { uiEntityEditor } from './entity_editor';
 export { uiFeatureInfo } from './feature_info';
 export { uiFeatureList } from './feature_list';
+export { uiField } from './field';
 export { uiFlash } from './flash';
 export { uiFullScreen } from './full_screen';
 export { uiGeolocate } from './geolocate';
@@ -26,7 +27,7 @@ export { uiMapInMap } from './map_in_map';
 export { uiModal } from './modal';
 export { uiModes } from './modes';
 export { uiNotice } from './notice';
-export { uiPreset } from './preset';
+export { uiPresetEditor } from './preset_editor';
 export { uiPresetIcon } from './preset_icon';
 export { uiPresetList } from './preset_list';
 export { uiRadialMenu } from './radial_menu';
diff --git a/modules/ui/init.js b/modules/ui/init.js
index 5a88f51cd..08181d367 100644
--- a/modules/ui/init.js
+++ b/modules/ui/init.js
@@ -261,7 +261,7 @@ export function uiInit(context) {
 
 
         // pan amount
-        var pa = 10;
+        var pa = 80;
 
         var keybinding = d3keybinding('main')
             .on('⌫', function() { d3.event.preventDefault(); })
@@ -290,18 +290,19 @@ export function uiInit(context) {
                 .call(uiShortcuts(context));
         }
 
-        var authenticating = uiLoading(context)
-            .message(t('loading_auth'))
-            .blocking(true);
+        var osm = context.connection(),
+            auth = uiLoading(context).message(t('loading_auth')).blocking(true);
 
-        context.connection()
-            .on('authLoading.ui', function() {
-                context.container()
-                    .call(authenticating);
-            })
-            .on('authDone.ui', function() {
-                authenticating.close();
-            });
+        if (osm && auth) {
+            osm
+                .on('authLoading.ui', function() {
+                    context.container()
+                        .call(auth);
+                })
+                .on('authDone.ui', function() {
+                    auth.close();
+                });
+        }
 
         uiInitCounter++;
 
diff --git a/modules/ui/intro/intro.js b/modules/ui/intro/intro.js
index c87e2aa6a..bb351c452 100644
--- a/modules/ui/intro/intro.js
+++ b/modules/ui/intro/intro.js
@@ -55,14 +55,15 @@ export function uiIntro(context) {
         context.enter(modeBrowse(context));
 
         // Save current map state
-        var history = context.history().toJSON(),
+        var osm = context.connection(),
+            history = context.history().toJSON(),
             hash = window.location.hash,
             center = context.map().center(),
             zoom = context.map().zoom(),
             background = context.background().baseLayerSource(),
             overlays = context.background().overlayLayerSources(),
             opacity = d3.selectAll('#map .layer-background').style('opacity'),
-            loadedTiles = context.connection().loadedTiles(),
+            loadedTiles = osm && osm.loadedTiles(),
             baseEntities = context.history().graph().base().entities,
             countryCode = services.geocoder.countryCode;
 
@@ -70,7 +71,7 @@ export function uiIntro(context) {
         context.inIntro(true);
 
         // Load semi-real data used in intro
-        context.connection().toggle(false).reset();
+        if (osm) { osm.toggle(false).reset(); }
         context.history().reset();
         context.history().merge(d3.values(coreGraph().load(introGraph).entities));
         context.history().checkpoint('initial');
@@ -109,11 +110,11 @@ export function uiIntro(context) {
             curtain.remove();
             navwrap.remove();
             d3.selectAll('#map .layer-background').style('opacity', opacity);
-            context.connection().toggle(true).reset().loadedTiles(loadedTiles);
+            if (osm) { osm.toggle(true).reset().loadedTiles(loadedTiles); }
             context.history().reset().merge(d3.values(baseEntities));
             context.background().baseLayerSource(background);
             overlays.forEach(function (d) { context.background().toggleOverlayLayer(d); });
-            if (history) context.history().fromJSON(history, false);
+            if (history) { context.history().fromJSON(history, false); }
             context.map().centerZoom(center, zoom);
             window.location.replace(hash);
             services.geocoder.countryCode = countryCode;
diff --git a/modules/ui/intro/navigation.js b/modules/ui/intro/navigation.js
index 003aa3c15..e3f93222c 100644
--- a/modules/ui/intro/navigation.js
+++ b/modules/ui/intro/navigation.js
@@ -326,7 +326,7 @@ export function uiIntroNavigation(context, reveal) {
 
         var onClick = function() { continueTo(closeTownHall); };
 
-        reveal('.inspector-body .inspector-preset',
+        reveal('.inspector-body .preset-editor',
             t('intro.navigation.fields_townhall'),
             { buttonText: t('intro.ok'), buttonCallback: onClick }
         );
diff --git a/modules/ui/modes.js b/modules/ui/modes.js
index fca3e07e9..ab4bdb024 100644
--- a/modules/ui/modes.js
+++ b/modules/ui/modes.js
@@ -35,7 +35,11 @@ export function uiModes(context) {
             .attr('tabindex', -1)
             .attr('class', function(mode) { return mode.id + ' add-button col4'; })
             .on('click.mode-buttons', function(mode) {
-                if (mode.id === context.mode().id) {
+                // When drawing, ignore accidental clicks on mode buttons - #4042
+                var currMode = context.mode().id;
+                if (currMode.match(/^draw/) !== null) return;
+
+                if (mode.id === currMode) {
                     context.enter(modeBrowse(context));
                 } else {
                     context.enter(mode);
diff --git a/modules/ui/panels/history.js b/modules/ui/panels/history.js
index a1c604d00..0c7418490 100644
--- a/modules/ui/panels/history.js
+++ b/modules/ui/panels/history.js
@@ -4,7 +4,7 @@ import { svgIcon } from '../../svg';
 
 
 export function uiPanelHistory(context) {
-
+    var osm;
 
     function displayTimestamp(entity) {
         if (!entity.timestamp) return t('info_panels.history.unknown');
@@ -33,13 +33,15 @@ export function uiPanelHistory(context) {
             .append('div')
             .attr('class', 'links');
 
-        links
-            .append('a')
-            .attr('class', 'user-osm-link')
-            .attr('href', context.connection().userURL(entity.user))
-            .attr('target', '_blank')
-            .attr('tabindex', -1)
-            .text('OSM');
+        if (osm) {
+            links
+                .append('a')
+                .attr('class', 'user-osm-link')
+                .attr('href', osm.userURL(entity.user))
+                .attr('target', '_blank')
+                .attr('tabindex', -1)
+                .text('OSM');
+        }
 
         links
             .append('a')
@@ -68,13 +70,15 @@ export function uiPanelHistory(context) {
             .append('div')
             .attr('class', 'links');
 
-        links
-            .append('a')
-            .attr('class', 'changeset-osm-link')
-            .attr('href', context.connection().changesetURL(entity.changeset))
-            .attr('target', '_blank')
-            .attr('tabindex', -1)
-            .text('OSM');
+        if (osm) {
+            links
+                .append('a')
+                .attr('class', 'changeset-osm-link')
+                .attr('href', osm.changesetURL(entity.changeset))
+                .attr('target', '_blank')
+                .attr('tabindex', -1)
+                .text('OSM');
+        }
 
         links
             .append('a')
@@ -90,6 +94,8 @@ export function uiPanelHistory(context) {
         var selected = _.filter(context.selectedIDs(), function(e) { return context.hasEntity(e); }),
             singular = selected.length === 1 ? selected[0] : null;
 
+        osm = context.connection();
+
         selection.html('');
 
         selection
@@ -122,15 +128,17 @@ export function uiPanelHistory(context) {
             .text(t('info_panels.history.changeset') + ': ')
             .call(displayChangeset, entity);
 
-        selection
-            .append('a')
-            .attr('class', 'view-history-on-osm')
-            .attr('target', '_blank')
-            .attr('tabindex', -1)
-            .attr('href', context.connection().historyURL(entity))
-            .call(svgIcon('#icon-out-link', 'inline'))
-            .append('span')
-            .text(t('info_panels.history.link_text'));
+        if (osm) {
+            selection
+                .append('a')
+                .attr('class', 'view-history-on-osm')
+                .attr('target', '_blank')
+                .attr('tabindex', -1)
+                .attr('href', osm.historyURL(entity))
+                .call(svgIcon('#icon-out-link', 'inline'))
+                .append('span')
+                .text(t('info_panels.history.link_text'));
+        }
     }
 
 
diff --git a/modules/ui/preset.js b/modules/ui/preset.js
deleted file mode 100644
index 677b35c0b..000000000
--- a/modules/ui/preset.js
+++ /dev/null
@@ -1,329 +0,0 @@
-import * as d3 from 'd3';
-import _ from 'lodash';
-import { d3combobox } from '../lib/d3.combobox.js';
-import { t, textDirection } from '../util/locale';
-import { modeBrowse } from '../modes/index';
-import { svgIcon } from '../svg/index';
-import { uiDisclosure } from './disclosure';
-import { uiFields } from './fields/index';
-import { uiTagReference } from './tag_reference';
-import {
-    utilGetSetValue,
-    utilNoAuto,
-    utilRebind
-} from '../util';
-
-
-export function uiPreset(context) {
-    var dispatch = d3.dispatch('change'),
-        state,
-        fieldsArr,
-        preset,
-        tags,
-        id;
-
-
-    // Field Constructor
-    function UIField(field, entity, show) {
-        field = _.clone(field);
-
-        field.input = uiFields[field.type](field, context)
-            .on('change', function(t, onInput) {
-                dispatch.call('change', field, t, onInput);
-            });
-
-        if (field.input.entity) field.input.entity(entity);
-
-        field.keys = field.keys || [field.key];
-
-        field.show = show;
-
-        field.shown = function() {
-            return field.id === 'name' || field.show || _.some(field.keys, function(key) { return !!tags[key]; });
-        };
-
-        field.modified = function() {
-            var original = context.graph().base().entities[entity.id];
-            return _.some(field.keys, function(key) {
-                return original ? tags[key] !== original.tags[key] : tags[key];
-            });
-        };
-
-        field.revert = function() {
-            var original = context.graph().base().entities[entity.id],
-                t = {};
-            field.keys.forEach(function(key) {
-                t[key] = original ? original.tags[key] : undefined;
-            });
-            return t;
-        };
-
-        field.present = function() {
-            return _.some(field.keys, function(key) {
-                return tags[key];
-            });
-        };
-
-        field.remove = function() {
-            var t = {};
-            field.keys.forEach(function(key) {
-                t[key] = undefined;
-            });
-            return t;
-        };
-
-        return field;
-    }
-
-
-    function fieldKey(field) {
-        return field.id;
-    }
-
-
-    function presets(selection) {
-        selection.call(uiDisclosure()
-            .title(t('inspector.all_fields'))
-            .expanded(context.storage('preset_fields.expanded') !== 'false')
-            .on('toggled', toggled)
-            .content(content)
-        );
-
-        function toggled(expanded) {
-            context.storage('preset_fields.expanded', expanded);
-        }
-    }
-
-
-    function content(selection) {
-        if (!fieldsArr) {
-            var entity = context.entity(id),
-                geometry = context.geometry(id),
-                presets = context.presets();
-
-            fieldsArr = [];
-
-            if (presets.field('name')) {
-                fieldsArr.push(UIField(presets.field('name'), entity));
-            }
-
-            preset.fields.forEach(function(field) {
-                if (field.matchGeometry(geometry)) {
-                    fieldsArr.push(UIField(field, entity, true));
-                }
-            });
-
-            if (entity.isHighwayIntersection(context.graph()) && presets.field('restrictions')) {
-                fieldsArr.push(UIField(presets.field('restrictions'), entity, true));
-            }
-
-            presets.universal().forEach(function(field) {
-                if (preset.fields.indexOf(field) < 0) {
-                    fieldsArr.push(UIField(field, entity));
-                }
-            });
-        }
-
-        var shown = fieldsArr.filter(function(field) { return field.shown(); }),
-            notShown = fieldsArr.filter(function(field) { return !field.shown(); });
-
-
-        var form = selection.selectAll('.preset-form')
-            .data([0]);
-
-        form = form.enter()
-            .append('div')
-            .attr('class', 'preset-form inspector-inner fillL3')
-            .merge(form);
-
-
-        var fields = form.selectAll('.form-field')
-            .data(shown, fieldKey);
-
-        fields.exit()
-            .remove();
-
-        // Enter
-        var enter = fields.enter()
-            .append('div')
-            .attr('class', function(field) {
-                return 'form-field form-field-' + field.id;
-            });
-
-        var label = enter
-            .append('label')
-            .attr('class', 'form-label')
-            .attr('for', function(field) { return 'preset-input-' + field.id; })
-            .text(function(field) { return field.label(); });
-
-        var wrap = label
-            .append('div')
-            .attr('class', 'form-label-button-wrap');
-
-        wrap.append('button')
-            .attr('class', 'remove-icon')
-            .attr('tabindex', -1)
-            .call(svgIcon('#operation-delete'));
-
-        wrap.append('button')
-            .attr('class', 'modified-icon')
-            .attr('tabindex', -1)
-            .call(
-                (textDirection === 'rtl') ? svgIcon('#icon-redo') : svgIcon('#icon-undo')
-            );
-
-
-        // Update
-        fields = fields
-            .merge(enter);
-
-        fields.selectAll('.form-label-button-wrap .remove-icon')
-            .on('click', remove);
-
-        fields.selectAll('.modified-icon')
-            .on('click', revert);
-
-        fields
-            .order()
-            .classed('modified', function(field) { return field.modified(); })
-            .classed('present', function(field) { return field.present(); })
-            .each(function(field) {
-                var referenceKey = field.key;
-                if (field.type === 'multiCombo') {   // lookup key without the trailing ':'
-                    referenceKey = referenceKey.replace(/:$/, '');
-                }
-                var reference = uiTagReference(field.reference || { key: referenceKey }, context);
-
-                if (state === 'hover') {
-                    reference.showing(false);
-                }
-
-                d3.select(this)
-                    .call(field.input)
-                    .selectAll('input')
-                    .on('keydown', function() {
-                        // if user presses enter, and combobox is not active, accept edits..
-                        if (d3.event.keyCode === 13 && d3.select('.combobox').empty()) {
-                            context.enter(modeBrowse(context));
-                        }
-                    });
-
-                d3.select(this)
-                    .call(reference.body)
-                    .select('.form-label-button-wrap')
-                    .call(reference.button);
-
-                field.input.tags(tags);
-            });
-
-        notShown = notShown.map(function(field) {
-            return {
-                title: field.label(),
-                value: field.label(),
-                field: field
-            };
-        });
-
-
-        var more = selection.selectAll('.more-fields')
-            .data((notShown.length > 0) ? [0] : []);
-
-        more.exit()
-            .remove();
-
-        more = more.enter()
-            .append('div')
-            .attr('class', 'more-fields')
-            .append('label')
-            .text(t('inspector.add_fields'))
-            .merge(more);
-
-
-        var input = more.selectAll('.value')
-            .data([0]);
-
-        input.exit()
-            .remove();
-
-        input = input.enter()
-            .append('input')
-            .attr('class', 'value')
-            .attr('type', 'text')
-            .call(utilNoAuto)
-            .merge(input);
-
-        input
-            .call(utilGetSetValue, '')
-            .attr('placeholder', function() {
-                var placeholder = [];
-                for (var field in notShown) {
-                    placeholder.push(notShown[field].title);
-                }
-                return placeholder.slice(0,3).join(', ') + ((placeholder.length > 3) ? '…' : '');
-            })
-            .call(d3combobox()
-                .container(context.container())
-                .data(notShown)
-                .minItems(1)
-                .on('accept', show)
-            );
-
-
-        function show(field) {
-            field = field.field;
-            field.show = true;
-            content(selection);
-            field.input.focus();
-        }
-
-
-        function revert(field) {
-            d3.event.stopPropagation();
-            d3.event.preventDefault();
-            dispatch.call('change', field, field.revert());
-        }
-
-
-        function remove(field) {
-            d3.event.stopPropagation();
-            d3.event.preventDefault();
-            dispatch.call('change', field, field.remove());
-        }
-    }
-
-
-    presets.preset = function(_) {
-        if (!arguments.length) return preset;
-        if (preset && preset.id === _.id) return presets;
-        preset = _;
-        fieldsArr = null;
-        return presets;
-    };
-
-
-    presets.state = function(_) {
-        if (!arguments.length) return state;
-        state = _;
-        return presets;
-    };
-
-
-    presets.tags = function(_) {
-        if (!arguments.length) return tags;
-        tags = _;
-        // Don't reset fieldsArr here.
-        return presets;
-    };
-
-
-    presets.entityID = function(_) {
-        if (!arguments.length) return id;
-        if (id === _) return presets;
-        id = _;
-        fieldsArr = null;
-        return presets;
-    };
-
-
-    return utilRebind(presets, dispatch, 'on');
-}
diff --git a/modules/ui/preset_editor.js b/modules/ui/preset_editor.js
new file mode 100644
index 000000000..beeb67cc5
--- /dev/null
+++ b/modules/ui/preset_editor.js
@@ -0,0 +1,220 @@
+import * as d3 from 'd3';
+import { d3combobox } from '../lib/d3.combobox.js';
+import { t } from '../util/locale';
+import { modeBrowse } from '../modes';
+import { uiDisclosure } from './disclosure';
+import { uiField } from './field';
+import {
+    utilGetSetValue,
+    utilNoAuto,
+    utilRebind
+} from '../util';
+
+
+export function uiPresetEditor(context) {
+    var dispatch = d3.dispatch('change'),
+        expandedPreference = (context.storage('preset_fields.expanded') !== 'false'),
+        state,
+        fieldsArr,
+        preset,
+        tags,
+        entityId;
+
+
+    function presetEditor(selection) {
+        selection.call(uiDisclosure()
+            .title(t('inspector.all_fields'))
+            .expanded(expandedPreference)
+            .on('toggled', toggled)
+            .content(render)
+        );
+
+        function toggled(expanded) {
+            expandedPreference = expanded;
+            context.storage('preset_fields.expanded', expanded);
+        }
+    }
+
+
+    function render(selection) {
+        if (!fieldsArr) {
+            var entity = context.entity(entityId),
+                geometry = context.geometry(entityId),
+                presets = context.presets();
+
+            fieldsArr = [];
+
+            preset.fields.forEach(function(field) {
+                if (field.matchGeometry(geometry)) {
+                    fieldsArr.push(
+                        uiField(context, field, entity)
+                    );
+                }
+            });
+
+            if (entity.isHighwayIntersection(context.graph()) && presets.field('restrictions')) {
+                fieldsArr.push(
+                    uiField(context, presets.field('restrictions'), entity)
+                );
+            }
+
+            presets.universal().forEach(function(field) {
+                if (preset.fields.indexOf(field) === -1) {
+                    fieldsArr.push(
+                        uiField(context, field, entity, { show: false })
+                    );
+                }
+            });
+
+            fieldsArr.forEach(function(field) {
+                field
+                    .on('change', function(t, onInput) {
+                        dispatch.call('change', field, t, onInput);
+                    });
+            });
+        }
+
+        fieldsArr.forEach(function(field) {
+            field
+                .state(state)
+                .tags(tags);
+        });
+
+        var shown = fieldsArr.filter(function(field) { return field.isShown(); }),
+            notShown = fieldsArr.filter(function(field) { return !field.isShown(); });
+
+
+        var form = selection.selectAll('.preset-form')
+            .data([0]);
+
+        form = form.enter()
+            .append('div')
+            .attr('class', 'preset-form inspector-inner fillL3')
+            .merge(form);
+
+
+        var fields = form.selectAll('.wrap-form-field')
+            .data(shown, function(d) { return d.id; });
+
+        fields.exit()
+            .remove();
+
+        // Enter
+        var enter = fields.enter()
+            .append('div')
+            .attr('class', function(d) { return 'wrap-form-field wrap-form-field-' + d.id; });
+
+        // Update
+        fields = fields
+            .merge(enter);
+
+        fields
+            .order()
+            .each(function(d) {
+                d3.select(this)
+                    .call(d.render)
+                    .selectAll('input')
+                    .on('keydown', function() {
+                        // if user presses enter, and combobox is not active, accept edits..
+                        if (d3.event.keyCode === 13 && d3.select('.combobox').empty()) {
+                            context.enter(modeBrowse(context));
+                        }
+                    });
+            });
+
+
+        notShown = notShown.map(function(field) {
+            return {
+                title: field.label(),
+                value: field.label(),
+                field: field
+            };
+        });
+
+
+        var more = selection.selectAll('.more-fields')
+            .data((notShown.length > 0) ? [0] : []);
+
+        more.exit()
+            .remove();
+
+        more = more.enter()
+            .append('div')
+            .attr('class', 'more-fields')
+            .append('label')
+            .text(t('inspector.add_fields'))
+            .merge(more);
+
+
+        var input = more.selectAll('.value')
+            .data([0]);
+
+        input.exit()
+            .remove();
+
+        input = input.enter()
+            .append('input')
+            .attr('class', 'value')
+            .attr('type', 'text')
+            .call(utilNoAuto)
+            .merge(input);
+
+        input
+            .call(utilGetSetValue, '')
+            .attr('placeholder', function() {
+                var placeholder = [];
+                for (var field in notShown) {
+                    placeholder.push(notShown[field].title);
+                }
+                return placeholder.slice(0,3).join(', ') + ((placeholder.length > 3) ? '…' : '');
+            })
+            .call(d3combobox()
+                .container(context.container())
+                .data(notShown)
+                .minItems(1)
+                .on('accept', function (d) {
+                    var field = d.field;
+                    field.show = true;
+                    render(selection);
+                    field.focus();
+                })
+            );
+
+    }
+
+
+    presetEditor.preset = function(_) {
+        if (!arguments.length) return preset;
+        if (preset && preset.id === _.id) return presetEditor;
+        preset = _;
+        fieldsArr = null;
+        return presetEditor;
+    };
+
+
+    presetEditor.state = function(_) {
+        if (!arguments.length) return state;
+        state = _;
+        return presetEditor;
+    };
+
+
+    presetEditor.tags = function(_) {
+        if (!arguments.length) return tags;
+        tags = _;
+        // Don't reset fieldsArr here.
+        return presetEditor;
+    };
+
+
+    presetEditor.entityID = function(_) {
+        if (!arguments.length) return entityId;
+        if (entityId === _) return presetEditor;
+        entityId = _;
+        fieldsArr = null;
+        return presetEditor;
+    };
+
+
+    return utilRebind(presetEditor, dispatch, 'on');
+}
diff --git a/modules/ui/raw_tag_editor.js b/modules/ui/raw_tag_editor.js
index 846d60797..c3bbb4f8a 100644
--- a/modules/ui/raw_tag_editor.js
+++ b/modules/ui/raw_tag_editor.js
@@ -15,9 +15,10 @@ import {
 export function uiRawTagEditor(context) {
     var taginfo = services.taginfo,
         dispatch = d3.dispatch('change'),
-        expanded = context.storage('raw_tag_editor.expanded') === 'true',
-        readOnlyTags = [],
+        expandedPreference = (context.storage('raw_tag_editor.expanded') === 'true'),
+        expandedCurrent = expandedPreference,
         updatePreference = true,
+        readOnlyTags = [],
         showBlank = false,
         newRow,
         state,
@@ -31,13 +32,15 @@ export function uiRawTagEditor(context) {
 
         selection.call(uiDisclosure()
             .title(t('inspector.all_tags') + ' (' + count + ')')
-            .expanded(expanded)
+            .expanded(expandedCurrent)
             .on('toggled', toggled)
             .content(content)
         );
 
         function toggled(expanded) {
+            expandedCurrent = expanded;
             if (updatePreference) {
+                expandedPreference = expanded;
                 context.storage('raw_tag_editor.expanded', expanded);
             }
             if (expanded) {
@@ -319,10 +322,10 @@ export function uiRawTagEditor(context) {
         if (!arguments.length) return preset;
         preset = _;
         if (preset.isFallback()) {
-            expanded = true;
+            expandedCurrent = true;
             updatePreference = false;
         } else {
-            expanded = context.storage('raw_tag_editor.expanded') === 'true';
+            expandedCurrent = expandedPreference;
             updatePreference = true;
         }
         return rawTagEditor;
@@ -344,8 +347,8 @@ export function uiRawTagEditor(context) {
 
 
     rawTagEditor.expanded = function(_) {
-        if (!arguments.length) return expanded;
-        expanded = _;
+        if (!arguments.length) return expandedCurrent;
+        expandedCurrent = _;
         updatePreference = false;
         return rawTagEditor;
     };
diff --git a/modules/ui/spinner.js b/modules/ui/spinner.js
index 9daaf4b92..758ed2d5d 100644
--- a/modules/ui/spinner.js
+++ b/modules/ui/spinner.js
@@ -1,5 +1,5 @@
 export function uiSpinner(context) {
-    var connection = context.connection();
+    var osm = context.connection();
 
 
     return function(selection) {
@@ -8,16 +8,16 @@ export function uiSpinner(context) {
             .attr('src', context.imagePath('loader-black.gif'))
             .style('opacity', 0);
 
-        connection
-            .on('loading.spinner', function() {
-                img.transition()
-                    .style('opacity', 1);
-            });
-
-        connection
-            .on('loaded.spinner', function() {
-                img.transition()
-                    .style('opacity', 0);
-            });
+        if (osm) {
+            osm
+                .on('loading.spinner', function() {
+                    img.transition()
+                        .style('opacity', 1);
+                })
+                .on('loaded.spinner', function() {
+                    img.transition()
+                        .style('opacity', 0);
+                });
+        }
     };
 }
diff --git a/modules/ui/status.js b/modules/ui/status.js
index 05cf2bc9d..d9ba2bd0e 100644
--- a/modules/ui/status.js
+++ b/modules/ui/status.js
@@ -4,12 +4,14 @@ import { svgIcon } from '../svg/index';
 
 
 export function uiStatus(context) {
-    var connection = context.connection();
+    var osm = context.connection();
+
 
     return function(selection) {
+        if (!osm) return;
 
         function update() {
-            connection.status(function(err, apiStatus) {
+            osm.status(function(err, apiStatus) {
                 selection.html('');
 
                 if (err) {
@@ -24,7 +26,7 @@ export function uiStatus(context) {
                             .text(t('login'))
                             .on('click.login', function() {
                                 d3.event.preventDefault();
-                                connection.authenticate();
+                                osm.authenticate();
                             });
                     } else {
                         // TODO: nice messages for different error types
@@ -41,8 +43,7 @@ export function uiStatus(context) {
             });
         }
 
-        connection
-            .on('change', function() { update(selection); });
+        osm.on('change', function() { update(selection); });
 
         window.setInterval(update, 90000);
         update(selection);
diff --git a/modules/ui/success.js b/modules/ui/success.js
index d7002520c..bf9b19541 100644
--- a/modules/ui/success.js
+++ b/modules/ui/success.js
@@ -43,8 +43,10 @@ export function uiSuccess(context) {
             .append('span')
             .text(t('success.help_link_text'));
 
-        var changesetURL = context.connection().changesetURL(changeset.id);
+        var osm = context.connection();
+        if (!osm) return;
 
+        var changesetURL = osm.changesetURL(changeset.id);
 
         var viewOnOsm = body
             .append('a')
@@ -62,9 +64,8 @@ export function uiSuccess(context) {
             .append('div')
             .text(t('success.view_on_osm'));
 
-
         var message = (changeset.tags.comment || t('success.edited_osm')).substring(0, 130) +
-            ' ' + context.connection().changesetURL(changeset.id);
+            ' ' + changesetURL;
 
         var sharing = {
             facebook: 'https://facebook.com/sharer/sharer.php?u=' + encodeURIComponent(changesetURL),
diff --git a/modules/util/detect.js b/modules/util/detect.js
index c8b24b35f..ed8f3ad2e 100644
--- a/modules/util/detect.js
+++ b/modules/util/detect.js
@@ -92,7 +92,7 @@ export function utilDetect(force) {
     // detect text direction
     var q = utilStringQs(window.location.hash.substring(1));
     var lang = dataLocales[detected.locale];
-    if ((lang && lang.rtl) || q.hasOwnProperty('rtl')) {
+    if ((lang && lang.rtl) || (q.rtl === 'true')) {
         detected.textDirection = 'rtl';
     } else {
         detected.textDirection = 'ltr';
diff --git a/package.json b/package.json
index 0e6db34fb..e81347773 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iD",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "description": "A friendly editor for OpenStreetMap",
   "main": "iD.js",
   "repository": "openstreetmap/iD",
@@ -39,39 +39,39 @@
   },
   "devDependencies": {
     "brfs": "1.4.3",
-    "chai": "~4.1.0",
+    "chai": "^4.1.0",
     "d3": "4.10.0",
-    "ecstatic": "~2.2.0",
+    "ecstatic": "^2.2.0",
     "editor-layer-index": "osmlab/editor-layer-index.git#gh-pages",
-    "gaze": "~1.1.1",
-    "eslint": "~4.3.0",
-    "glob": "~7.1.0",
-    "happen": "~0.3.1",
-    "js-yaml": "~3.9.0",
-    "jsonschema": "~1.1.0",
-    "json-stable-stringify": "~1.0.1",
+    "gaze": "^1.1.1",
+    "eslint": "^4.3.0",
+    "glob": "^7.1.0",
+    "happen": "^0.3.1",
+    "js-yaml": "^3.9.0",
+    "jsonschema": "^1.1.0",
+    "json-stable-stringify": "^1.0.1",
     "@mapbox/maki": "^4.0.0",
-    "mapillary-js": "2.6.0",
-    "minimist": "~1.2.0",
-    "mocha": "~3.4.0",
-    "mocha-phantomjs-core": "~2.1.0",
+    "mapillary-js": "2.7.0",
+    "minimist": "^1.2.0",
+    "mocha": "^3.4.0",
+    "mocha-phantomjs-core": "^2.1.0",
     "name-suggestion-index": "0.1.1",
-    "npm-run-all": "~4.0.0",
+    "npm-run-all": "^4.0.0",
     "phantomjs-prebuilt": "~2.1.11",
-    "request": "~2.81.0",
+    "request": "^2.81.0",
     "rollup": "0.45.2",
-    "rollup-plugin-commonjs": "8.0.2",
+    "rollup-plugin-commonjs": "8.1.0",
     "rollup-plugin-json": "2.2.0",
     "rollup-plugin-node-resolve": "3.0.0",
-    "shelljs": "~0.7.5",
-    "shx": "~0.2.1",
-    "sinon": "~2.3.0",
-    "sinon-chai": "~2.12.0",
+    "shelljs": "^0.7.5",
+    "shx": "^0.2.1",
+    "sinon": "^2.3.0",
+    "sinon-chai": "^2.12.0",
     "smash": "0.0",
     "svg-sprite": "1.3.7",
-    "uglify-js": "~3.0.0",
-    "xml2js": "~0.4.17",
-    "xmlbuilder": "~9.0.1"
+    "uglify-js": "^3.0.0",
+    "xml2js": "^0.4.17",
+    "xmlbuilder": "^9.0.1"
   },
   "greenkeeper": {
     "label": "chore-greenkeeper"
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index c97e02c38..13b04a419 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -17,6 +17,8 @@ orig=`git rev-parse --short origin/master`
 
 # pull latest code
 if [[ "${rev}" != "${orig}" ]] ; then
+  # avoid issues with local untracked locale files
+  rm -f dist/locales/*.json
   git reset --hard HEAD
   git pull origin master
 
@@ -24,7 +26,7 @@ if [[ "${rev}" != "${orig}" ]] ; then
   sed -i "s/context.version = .*;/context.version = '${rev}';/" modules/core/context.js
 
   npm prune
-  npm install
+  npm install > /dev/null 2>&1
 fi
 
 # pull latest imagery
diff --git a/svg/iD-sprite.json b/svg/iD-sprite.json
index e20458558..d926e54aa 100644
--- a/svg/iD-sprite.json
+++ b/svg/iD-sprite.json
@@ -273,6 +273,8 @@
     "poi-windmill":             { "viewBox": "610 320 15 15" },
     "poi-hinduist":             { "viewBox": "625 320 15 15" },
     "poi-shintoist":            { "viewBox": "640 320 15 15" },
+    "poi-buffer-stop":          { "viewBox": "655 320 15 15" },
+    "poi-railway-signals":      { "viewBox": "670 320 15 15" },
 
     "poi-foot-shape":              { "fill": "currentColor" },
     "poi-traffic-signals-shape":   { "fill": "currentColor" },
@@ -291,6 +293,8 @@
     "poi-windmill-shape":          { "fill": "currentColor" },
     "poi-hinduist-shape":          { "fill": "currentColor" },
     "poi-shintoist-shape":         { "fill": "currentColor" },
+    "poi-buffer-stop-shape":       { "fill": "currentColor" },
+    "poi-railway-signals-shape":   { "fill": "currentColor" },
 
     "poi-vending-machine":      { "viewBox": "400 335 15 15" },
     "poi-dice":                 { "viewBox": "415 335 15 15" },
@@ -309,6 +313,7 @@
     "poi-nuclear":              { "viewBox": "610 335 15 15" },
     "poi-sikhist":              { "viewBox": "625 335 15 15" },
     "poi-taoist":               { "viewBox": "640 335 15 15" },
+    "poi-milestone":            { "viewBox": "655 335 15 15" },
 
     "poi-vending-machine-shape":   { "fill": "currentColor" },
     "poi-dice-shape":              { "fill": "currentColor" },
@@ -327,6 +332,7 @@
     "poi-nuclear-shape":           { "fill": "currentColor" },
     "poi-sikhist-shape":           { "fill": "currentColor" },
     "poi-taoist-shape":            { "fill": "currentColor" },
+    "poi-milestone-shape":         { "fill": "currentColor" },
 
     "poi-vertex":               { "viewBox": "400 350 15 15" },
 
diff --git a/svg/iD-sprite.src.idraw b/svg/iD-sprite.src.idraw
index 51fbb2e4c..a54e421c9 100644
Binary files a/svg/iD-sprite.src.idraw and b/svg/iD-sprite.src.idraw differ
diff --git a/svg/iD-sprite.src.svg b/svg/iD-sprite.src.svg
index de6432c3a..875406597 100644
--- a/svg/iD-sprite.src.svg
+++ b/svg/iD-sprite.src.svg
@@ -315,6 +315,9 @@
     <g id="poi-vertex">
       <path d="M407.5,354.5 C409.157,354.5 410.5,355.843 410.5,357.5 C410.5,359.157 409.157,360.5 407.5,360.5 C405.843,360.5 404.5,359.157 404.5,357.5 C404.5,355.843 405.843,354.5 407.5,354.5 z" fill="#000000" id="poi-vertex-shape"/>
     </g>
+    <g id="poi-milestone">
+      <path d="M658,339.5 C658,334.5 667,334.5 667,339.5 L667,340.5 L658,340.5 z M658,341 L658,349.5 L667,349.5 L667,341 L658,341 z" fill="#000000" id="poi-milestone-shape"/>
+    </g>
     <g id="poi-taoist">
       <path d="M647.5,350 C651.634,350 655,346.605 655,342.5 C655,338.395 651.654,335 647.5,335 C643.346,335 640,338.364 640,342.5 C640,346.636 643.366,350 647.5,350 z M647.5,348.929 C643.943,348.929 641.071,346.057 641.071,342.5 C641.071,338.943 643.943,336.071 647.5,336.071 C650.714,336.071 651.786,341.942 647.5,342.5 C643.214,343.058 644.377,348.929 647.5,348.929 z M647.5,346.786 C646.908,346.786 646.429,346.306 646.429,345.714 C646.429,345.123 646.908,344.643 647.5,344.643 C648.092,344.643 648.571,345.123 648.571,345.714 C648.571,346.306 648.092,346.786 647.5,346.786 z M647.5,340.357 C648.092,340.357 648.571,339.877 648.571,339.286 C648.571,338.694 648.092,338.214 647.5,338.214 C646.908,338.214 646.429,338.694 646.429,339.286 C646.429,339.877 646.908,340.357 647.5,340.357 z" fill="#000000" id="poi-taoist-shape"/>
     </g>
@@ -366,6 +369,12 @@
     <g id="poi-vending-machine">
       <path d="M412,335 C412.552,335 413,335.448 413,336 L413,349 C413,349.552 412.552,350 412,350 L403,350 C402.448,350 402,349.552 402,349 L402,336 C402,335.448 402.448,335 403,335 L412,335 z M409,346 L406,346 L406,347.5 L409,347.5 L409,346 z M409,341 L408,341 L408,342 L409,342 L409,341 z M405,341 L404,341 L404,342 L405,342 L405,341 z M407,341 L406,341 L406,342 L407,342 L407,341 z M411,341 L410,341 L410,342 L411,342 L411,341 z M411,339 L410,339 L410,340 L411,340 L411,339 z M407,339 L406,339 L406,340 L407,340 L407,339 z M405,339 L404,339 L404,340 L405,340 L405,339 z M409,339 L408,339 L408,340 L409,340 L409,339 z M409,337 L408,337 L408,338 L409,338 L409,337 z M405,337 L404,337 L404,338 L405,338 L405,337 z M407,337 L406,337 L406,338 L407,338 L407,337 z M411,337 L410,337 L410,338 L411,338 L411,337 z" fill="#000000" id="poi-vending-machine-shape"/>
     </g>
+    <g id="poi-railway-signals">
+      <path d="M679.214,321.5 C680.476,321.5 681.5,322.533 681.5,323.808 L681.5,331.192 C681.5,332.466 680.477,333.5 679.214,333.5 L675.786,333.499 C674.523,333.5 673.5,332.466 673.5,331.192 L673.5,323.808 C673.5,322.533 674.523,321.5 675.786,321.5 L679.214,321.5 z M677.5,328.5 C676.672,328.5 676,329.172 676,330 C676,330.828 676.672,331.5 677.5,331.5 C678.328,331.5 679,330.828 679,330 C679,329.172 678.328,328.5 677.5,328.5 z M677.5,323.5 C676.672,323.5 676,324.172 676,325 C676,325.829 676.672,326.5 677.5,326.5 C678.328,326.5 679,325.829 679,325 C679,324.172 678.328,323.5 677.5,323.5 z" fill="#000000" id="poi-railway-signals-shape"/>
+    </g>
+    <g id="poi-buffer-stop">
+      <path d="M657,322 C657.552,322 658,322.448 658,323 L658,323.555 L667.384,332 L668,332 C668.552,332 669,332.448 669,333 C669,333.552 668.552,334 668,334 L657,334 C656.448,334 656,333.552 656,333 C656,332.448 656.448,332 657,332 L657.5,332 L659.874,328 L658,326.208 C657.956,326.732 657.428,326.914 657,327 C656.448,327 656,326.552 656,326 L656,323 C656,322.448 656.448,322 657,322 z M661.389,329.295 L659.75,332 L664.394,332 L661.389,329.295 z" fill="#000000" id="poi-buffer-stop-shape"/>
+    </g>
     <g id="poi-shintoist">
       <path d="M640,320 C640,321.071 640.701,321.756 641.071,322.126 C641.442,322.496 641.974,322.353 641.974,322.632 C641.974,322.632 642.143,323.198 642.679,323.198 L644.018,323.198 C644.018,323.506 644.286,323.733 644.286,323.733 C644.286,323.733 644.018,323.884 644.018,324.269 L642.679,324.269 C642.143,324.269 642.143,324.537 642.143,324.805 C642.143,325.37 642.143,325.876 642.143,325.876 C642.143,326.133 642.39,326.412 642.679,326.412 C642.967,326.412 644.018,326.412 644.018,326.412 L644.018,327.483 L643.214,327.483 C643.214,327.918 643.504,328.267 644.018,328.555 C644.018,328.894 644.018,334.448 644.018,334.448 C644.018,335.153 645.625,335.214 645.625,334.448 L645.625,326.412 L649.375,326.412 L649.375,334.448 C649.375,335.189 650.982,335.137 650.982,334.448 C650.982,334.448 650.982,328.894 650.982,328.555 C651.496,328.221 651.786,327.92 651.786,327.483 L650.982,327.483 L650.982,326.412 C650.982,326.412 652.033,326.412 652.321,326.412 C652.558,326.412 652.857,326.133 652.857,325.876 C652.857,325.876 652.857,325.34 652.857,324.805 C652.857,324.269 652.563,324.269 652.321,324.269 L650.982,324.269 C651.008,323.986 650.714,323.733 650.714,323.733 C650.714,323.733 650.982,323.506 650.982,323.198 L652.321,323.198 C652.857,323.198 652.857,322.662 652.857,322.662 C652.857,322.409 653.482,322.513 653.929,322.126 C654.376,321.739 655,321.071 655,320 C648.571,321.071 645.357,321.071 640,320 z M645.625,323.198 C645.625,323.198 646.696,323.198 646.696,323.198 L646.696,324.269 L645.625,324.269 C645.625,323.961 645.357,323.733 645.357,323.733 C645.357,323.733 645.625,323.531 645.625,323.198 z M648.304,323.198 L649.375,323.198 C649.375,323.481 649.643,323.733 649.643,323.733 C649.643,323.733 649.375,323.986 649.375,324.269 L648.304,324.269 z" fill="#000000" id="poi-shintoist-shape"/>
     </g>
diff --git a/test/index.html b/test/index.html
index ad42a95b7..cf2737c66 100644
--- a/test/index.html
+++ b/test/index.html
@@ -6,7 +6,7 @@
     <link rel='stylesheet' href='../node_modules/mocha/mocha.css'>
     <link rel='stylesheet' href='../dist/iD.css'>
 </head>
-<body>
+<body style="overflow:scroll">
     <div id='mocha'></div>
 
     <script src='../node_modules/mocha/mocha.js'></script>
diff --git a/test/spec/behavior/hash.js b/test/spec/behavior/hash.js
index fda5c8da3..2c4d4f04f 100644
--- a/test/spec/behavior/hash.js
+++ b/test/spec/behavior/hash.js
@@ -5,8 +5,6 @@ describe('iD.behaviorHash', function () {
 
     beforeEach(function () {
         context = iD.Context();
-        context.connection().loadTiles = function () {};   // Neuter connection
-
         var container = d3.select(document.createElement('div'));
         context.container(container);
         container.call(context.map());
@@ -15,6 +13,7 @@ describe('iD.behaviorHash', function () {
 
     afterEach(function () {
         hash.off();
+        location.hash = '';
     });
 
     it('sets hadHash if location.hash is present', function () {
diff --git a/test/spec/osm/way.js b/test/spec/osm/way.js
index f45a98ae1..3881358e9 100644
--- a/test/spec/osm/way.js
+++ b/test/spec/osm/way.js
@@ -345,6 +345,16 @@ describe('iD.osmWay', function() {
             expect(iD.Way({nodes: ['n1', 'n1'], tags: {building: 'yes'}}).isArea()).to.equal(true);
         });
 
+        it('returns true for some highway and railway exceptions', function() {
+            expect(iD.Way({nodes: ['n1', 'n1'], tags: { highway: 'services' }}).isArea(), 'highway=services').to.equal(true);
+            expect(iD.Way({nodes: ['n1', 'n1'], tags: { highway: 'rest_area' }}).isArea(), 'highway=rest_area').to.equal(true);
+            expect(iD.Way({nodes: ['n1', 'n1'], tags: { railway: 'roundhouse' }}).isArea(), 'railway=roundhouse').to.equal(true);
+            expect(iD.Way({nodes: ['n1', 'n1'], tags: { railway: 'station' }}).isArea(), 'railway=station').to.equal(true);
+            expect(iD.Way({nodes: ['n1', 'n1'], tags: { railway: 'traverser' }}).isArea(), 'railway=traverser').to.equal(true);
+            expect(iD.Way({nodes: ['n1', 'n1'], tags: { railway: 'turntable' }}).isArea(), 'railway=turntable').to.equal(true);
+            expect(iD.Way({nodes: ['n1', 'n1'], tags: { railway: 'wash' }}).isArea(), 'railway=wash').to.equal(true);
+        });
+
         it('returns false if the way is closed and has no keys in iD.areaKeys', function() {
             expect(iD.Way({nodes: ['n1', 'n1'], tags: {a: 'b'}}).isArea()).to.equal(false);
         });
diff --git a/test/spec/services/mapillary.js b/test/spec/services/mapillary.js
index 0bf7b7f39..dd184db05 100644
--- a/test/spec/services/mapillary.js
+++ b/test/spec/services/mapillary.js
@@ -6,6 +6,14 @@ describe('iD.serviceMapillary', function() {
         context, server, mapillary, orig;
 
 
+    before(function() {
+        iD.services.mapillary = iD.serviceMapillary;
+    });
+
+    after(function() {
+        delete iD.services.mapillary;
+    });
+
     beforeEach(function() {
         context = iD.Context().assetPath('../dist/');
         context.projection
diff --git a/test/spec/services/nominatim.js b/test/spec/services/nominatim.js
index 37e5a60ee..fb984039b 100644
--- a/test/spec/services/nominatim.js
+++ b/test/spec/services/nominatim.js
@@ -1,6 +1,15 @@
 describe('iD.serviceNominatim', function() {
     var server, nominatim;
 
+
+    before(function() {
+        iD.services.geocoder = iD.serviceNominatim;
+    });
+
+    after(function() {
+        delete iD.services.geocoder;
+    });
+
     beforeEach(function() {
         server = sinon.fakeServer.create();
         nominatim = iD.services.geocoder;
diff --git a/test/spec/services/osm.js b/test/spec/services/osm.js
index 259a0cc7d..f23c1d635 100644
--- a/test/spec/services/osm.js
+++ b/test/spec/services/osm.js
@@ -1,5 +1,5 @@
 describe('iD.serviceOsm', function () {
-    var context, connection, spy;
+    var context, connection, server, spy;
 
     function login() {
         if (!connection) return;
@@ -17,7 +17,16 @@ describe('iD.serviceOsm', function () {
         connection.logout();
     }
 
+    before(function() {
+        iD.services.osm = iD.serviceOsm;
+    });
+
+    after(function() {
+        delete iD.services.osm;
+    });
+
     beforeEach(function () {
+        server = sinon.fakeServer.create();
         context = iD.Context();
         connection = context.connection();
         connection.switch({ urlroot: 'http://www.openstreetmap.org' });
@@ -25,6 +34,10 @@ describe('iD.serviceOsm', function () {
         spy = sinon.spy();
     });
 
+    afterEach(function() {
+        server.restore();
+    });
+
 
     it('is instantiated', function () {
         expect(connection).to.be.ok;
@@ -109,8 +122,7 @@ describe('iD.serviceOsm', function () {
     });
 
     describe('#loadFromAPI', function () {
-        var server,
-            path = '/api/0.6/map?bbox=-74.542,40.655,-74.541,40.656',
+        var path = '/api/0.6/map?bbox=-74.542,40.655,-74.541,40.656',
             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' +
@@ -267,8 +279,7 @@ describe('iD.serviceOsm', function () {
     });
 
     describe('#loadEntity', function () {
-        var server,
-            nodeXML = '<?xml version="1.0" encoding="UTF-8"?><osm>' +
+        var nodeXML = '<?xml version="1.0" encoding="UTF-8"?><osm>' +
                 '<node id="1" version="1" changeset="1" lat="0" lon="0" visible="true" timestamp="2009-03-07T03:26:33Z"></node>' +
                 '</osm>',
             wayXML = '<?xml version="1.0" encoding="UTF-8"?><osm>' +
@@ -312,8 +323,7 @@ describe('iD.serviceOsm', function () {
     });
 
     describe('#loadEntityVersion', function () {
-        var server,
-            nodeXML = '<?xml version="1.0" encoding="UTF-8"?><osm>' +
+        var nodeXML = '<?xml version="1.0" encoding="UTF-8"?><osm>' +
                 '<node id="1" version="1" changeset="1" lat="0" lon="0" visible="true" timestamp="2009-03-07T03:26:33Z"></node>' +
                 '</osm>',
             wayXML = '<?xml version="1.0" encoding="UTF-8"?><osm>' +
@@ -356,7 +366,6 @@ describe('iD.serviceOsm', function () {
     });
 
     describe('#loadMultiple', function () {
-        var server;
         beforeEach(function() {
             server = sinon.fakeServer.create();
         });
@@ -372,7 +381,7 @@ describe('iD.serviceOsm', function () {
 
 
     describe('#userChangesets', function() {
-        var server, userDetailsFn;
+        var userDetailsFn;
 
         beforeEach(function() {
             server = sinon.fakeServer.create();
@@ -477,8 +486,7 @@ describe('iD.serviceOsm', function () {
 
 
     describe('API capabilities', function() {
-        var server,
-            capabilitiesXML = '<?xml version="1.0" encoding="UTF-8"?><osm>' +
+        var capabilitiesXML = '<?xml version="1.0" encoding="UTF-8"?><osm>' +
             '<api>' +
             '<version minimum="0.6" maximum="0.6"/>' +
             '<area maximum="0.25"/>' +
diff --git a/test/spec/services/taginfo.js b/test/spec/services/taginfo.js
index fab95b44e..7db16fb27 100644
--- a/test/spec/services/taginfo.js
+++ b/test/spec/services/taginfo.js
@@ -1,6 +1,15 @@
 describe('iD.serviceTaginfo', function() {
     var server, taginfo;
 
+
+    before(function() {
+        iD.services.taginfo = iD.serviceTaginfo;
+    });
+
+    after(function() {
+        delete iD.services.taginfo;
+    });
+
     beforeEach(function() {
         server = sinon.fakeServer.create();
         taginfo = iD.services.taginfo;
diff --git a/test/spec/spec_helpers.js b/test/spec/spec_helpers.js
index 8fc8e30db..50fba97a4 100644
--- a/test/spec/spec_helpers.js
+++ b/test/spec/spec_helpers.js
@@ -1,7 +1,10 @@
 /* globals chai:false */
 
 iD.debug = true;
+
+// disable things that use the network
 iD.data.imagery = [];
+_.forEach(iD.services, function(v,k) { delete iD.services[k]; });
 
 mocha.setup({
     ui: 'bdd',
diff --git a/test/spec/svg/midpoints.js b/test/spec/svg/midpoints.js
index b844b8628..92266c5c6 100644
--- a/test/spec/svg/midpoints.js
+++ b/test/spec/svg/midpoints.js
@@ -1,13 +1,21 @@
 describe('iD.svgMidpoints', function () {
     var context, surface,
+        selectedIDs = [],
         projection = d3.geoProjection(function(x, y) { return [x, -y]; })
             .translate([0, 0])
             .scale(180 / Math.PI)
             .clipExtent([[0, 0], [Infinity, Infinity]]),
         filter = function() { return true; };
 
+
     beforeEach(function () {
         context = iD.Context();
+        context.mode = function() {
+            return {
+                id: 'select',
+                selectedIDs: function() { return selectedIDs; }
+            };
+        };
         d3.select(document.createElement('div'))
             .attr('id', 'map')
             .call(context.map());
@@ -22,10 +30,12 @@ describe('iD.svgMidpoints', function () {
             graph = iD.Graph([a, b, line]),
             extent = iD.geoExtent([0, 0], [100, 100]);
 
-        context.selectedIDs = function() { return [line.id]; };
+        selectedIDs = [line.id];
+        context.selectedIDs = function() { return selectedIDs; };
         context.entity = function(id) { return graph.entity(id); };
-        surface.call(iD.svgMidpoints(projection, context), graph, [line], filter, extent);
+        context.hasEntity = context.entity;
 
+        surface.call(iD.svgMidpoints(projection, context), graph, [line], filter, extent);
         expect(surface.selectAll('.midpoint').datum().loc).to.eql([25, 0]);
     });
 
@@ -36,9 +46,12 @@ describe('iD.svgMidpoints', function () {
             graph = iD.Graph([a, b, line]),
             extent = iD.geoExtent([0, 0], [100, 100]);
 
-        context.selectedIDs = function() { return [line.id]; };
-        surface.call(iD.svgMidpoints(projection, context), graph, [line], filter, extent);
+        selectedIDs = [line.id];
+        context.selectedIDs = function() { return selectedIDs; };
+        context.entity = function(id) { return graph.entity(id); };
+        context.hasEntity = context.entity;
 
+        surface.call(iD.svgMidpoints(projection, context), graph, [line], filter, extent);
         expect(surface.selectAll('.midpoint').nodes()).to.have.length(0);
     });
 
@@ -49,9 +62,12 @@ describe('iD.svgMidpoints', function () {
             graph = iD.Graph([a, b, line]),
             extent = iD.geoExtent([0, 0], [100, 100]);
 
-        context.selectedIDs = function() { return [line.id]; };
-        surface.call(iD.svgMidpoints(projection, context), graph, [line], filter, extent);
+        selectedIDs = [line.id];
+        context.selectedIDs = function() { return selectedIDs; };
+        context.entity = function(id) { return graph.entity(id); };
+        context.hasEntity = context.entity;
 
+        surface.call(iD.svgMidpoints(projection, context), graph, [line], filter, extent);
         expect(surface.selectAll('.midpoint').nodes()).to.have.length(0);
     });
 
@@ -62,10 +78,12 @@ describe('iD.svgMidpoints', function () {
             graph = iD.Graph([a, b, line]),
             extent = iD.geoExtent([0, 0], [100, 100]);
 
-        context.selectedIDs = function() { return [line.id]; };
+        selectedIDs = [line.id];
+        context.selectedIDs = function() { return selectedIDs; };
         context.entity = function(id) { return graph.entity(id); };
-        surface.call(iD.svgMidpoints(projection, context), graph, [line], filter, extent);
+        context.hasEntity = context.entity;
 
+        surface.call(iD.svgMidpoints(projection, context), graph, [line], filter, extent);
         expect(surface.selectAll('.midpoint').datum().loc).to.eql([100, 0]);
     });
 
@@ -76,9 +94,12 @@ describe('iD.svgMidpoints', function () {
             graph = iD.Graph([a, b, line]),
             extent = iD.geoExtent([0, 0], [100, 100]);
 
-        context.selectedIDs = function() { return [line.id]; };
-        surface.call(iD.svgMidpoints(projection, context), graph, [line], filter, extent);
+        selectedIDs = [line.id];
+        context.selectedIDs = function() { return selectedIDs; };
+        context.entity = function(id) { return graph.entity(id); };
+        context.hasEntity = context.entity;
 
+        surface.call(iD.svgMidpoints(projection, context), graph, [line], filter, extent);
         expect(surface.selectAll('.midpoint').nodes()).to.have.length(0);
     });
 
diff --git a/test/spec/ui/confirm.js b/test/spec/ui/confirm.js
index 5e2b83770..a12db432d 100644
--- a/test/spec/ui/confirm.js
+++ b/test/spec/ui/confirm.js
@@ -2,11 +2,14 @@ describe('iD.uiConfirm', function () {
     var elem;
 
     beforeEach(function() {
-        elem = d3.select('body').append('div');
+        elem = d3.select('body')
+            .append('div')
+            .attr('id', 'confirm-wrap');
     });
 
     afterEach(function() {
-        elem.remove();
+        d3.select('#confirm-wrap')
+            .remove();
     });
 
     it('can be instantiated', function () {
diff --git a/test/spec/ui/fields/wikipedia.js b/test/spec/ui/fields/wikipedia.js
index 80a25957e..c6aa35a57 100644
--- a/test/spec/ui/fields/wikipedia.js
+++ b/test/spec/ui/fields/wikipedia.js
@@ -1,7 +1,6 @@
 describe('iD.uiFieldWikipedia', function() {
     var entity, context, selection, field;
 
-
     function changeTags(changed) {
         var e = context.entity(entity.id),
             annotation = 'Changed tags.',
@@ -18,6 +17,16 @@ describe('iD.uiFieldWikipedia', function() {
         }
     }
 
+    before(function() {
+        iD.services.wikipedia = iD.serviceWikipedia;
+        iD.services.wikidata = iD.serviceWikidata;
+    });
+
+    after(function() {
+        delete iD.services.wikipedia;
+        delete iD.services.wikidata;
+    });
+
     beforeEach(function() {
         entity = iD.Node({id: 'n12345'});
         context = iD.Context();
@@ -95,7 +104,7 @@ describe('iD.uiFieldWikipedia', function() {
         var wikipedia = iD.uiFieldWikipedia(field, context).entity(entity);
         wikipedia.on('change', changeTags);
         selection.call(wikipedia);
-        window.JSONP_DELAY = 20;
+        window.JSONP_DELAY = 60;
 
         var spy = sinon.spy();
         wikipedia.on('change.spy', spy);
@@ -105,21 +114,27 @@ describe('iD.uiFieldWikipedia', function() {
         iD.utilGetSetValue(selection.selectAll('.wiki-title'), 'Skip');
         happen.once(selection.selectAll('.wiki-title').node(), { type: 'change' });
         happen.once(selection.selectAll('.wiki-title').node(), { type: 'blur' });
+
+        // t0
         expect(context.entity(entity.id).tags.wikidata).to.be.undefined;
 
-        // Set title to "Title" after 10ms
+        // t30:  graph change - Set title to "Title"
         window.setTimeout(function() {
             iD.utilGetSetValue(selection.selectAll('.wiki-title'), 'Title');
             happen.once(selection.selectAll('.wiki-title').node(), { type: 'change' });
             happen.once(selection.selectAll('.wiki-title').node(), { type: 'blur' });
-        }, 10);
+        }, 30);
 
-        // wikidata not set (t0 + 20ms) after wikipedia="skip" because graph changed
+        // t60:  at t0 + 60ms (JSONP_DELAY), wikidata SHOULD NOT be set because graph has changed.
+
+        // t70:  check that wikidata unchanged
         window.setTimeout(function() {
             expect(context.entity(entity.id).tags.wikidata).to.be.undefined;
-        }, 25);
+        }, 70);
 
-        // wikidata set (t10 + 20ms) after wikipedia="title" because graph unchanged
+        // t90:  at t30 + 60ms (JSONP_DELAY), wikidata SHOULD be set because graph is unchanged.
+
+        // t100:  check that wikidata has changed
         window.setTimeout(function() {
             expect(context.entity(entity.id).tags.wikidata).to.equal('Q216353');
 
@@ -129,7 +144,7 @@ describe('iD.uiFieldWikipedia', function() {
             expect(spy.getCall(2)).to.have.been.calledWith({ wikipedia: 'de:Title' });  // 'Title' on change +10ms
             expect(spy.getCall(3)).to.have.been.calledWith({ wikipedia: 'de:Title' });  // 'Title' on blur   +10ms
             done();
-        }, 35);
+        }, 100);
 
     });
 });
diff --git a/test/spec/ui/flash.js b/test/spec/ui/flash.js
index 08174d66a..3fa10b0d1 100644
--- a/test/spec/ui/flash.js
+++ b/test/spec/ui/flash.js
@@ -9,7 +9,8 @@ describe('iD.uiFlash', function () {
     });
 
     afterEach(function() {
-        d3.select('body > div').remove();
+        d3.select('#flash-wrap')
+            .remove();
     });
 
     it('returns a selection', function () {
diff --git a/test/spec/ui/modal.js b/test/spec/ui/modal.js
index c6c13348d..d59d339a2 100644
--- a/test/spec/ui/modal.js
+++ b/test/spec/ui/modal.js
@@ -2,11 +2,14 @@ describe('iD.uiModal', function () {
     var elem;
 
     beforeEach(function() {
-        elem = d3.select('body').append('div');
+        elem = d3.select('body')
+            .append('div')
+            .attr('id', 'modal-wrap');
     });
 
     afterEach(function() {
-        elem.remove();
+        d3.select('#modal-wrap')
+            .remove();
     });
 
     it('can be instantiated', function() {
diff --git a/test/spec/ui/raw_tag_editor.js b/test/spec/ui/raw_tag_editor.js
index e7f46999e..ac7212ef9 100644
--- a/test/spec/ui/raw_tag_editor.js
+++ b/test/spec/ui/raw_tag_editor.js
@@ -1,6 +1,5 @@
 describe('iD.uiRawTagEditor', function() {
-    var taglist, element,
-        entity, context;
+    var taglist, element, entity, context;
 
     function render(tags) {
         taglist = iD.uiRawTagEditor(context)
@@ -10,6 +9,7 @@ describe('iD.uiRawTagEditor', function() {
 
         element = d3.select('body')
             .append('div')
+            .attr('class', 'ui-wrap')
             .call(taglist);
     }
 
@@ -21,9 +21,11 @@ describe('iD.uiRawTagEditor', function() {
     });
 
     afterEach(function () {
-        element.remove();
+        d3.selectAll('.ui-wrap')
+            .remove();
     });
 
+
     it('creates input elements for each key-value pair', function () {
         expect(element.selectAll('input[value=highway]')).not.to.be.empty;
         expect(element.selectAll('input[value=residential]')).not.to.be.empty;