From 66b9054e3865911d1b5ba2c8b6cdb655401afb35 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 18 Mar 2013 14:41:01 -0700
Subject: [PATCH] Generate preset translations from .json files

This makes the .json files the one-stop-shop for adding/modifying
presets. You don't have to remember to also update presets.yaml.
---
 build.js                                      |  25 +-
 data/presets.yaml                             |  80 +--
 data/presets/fields.json                      | 210 +++++---
 data/presets/fields/access.json               |   3 +-
 data/presets/fields/address.json              |  13 +-
 data/presets/fields/aeroway.json              |   5 +-
 data/presets/fields/amenity.json              |   5 +-
 data/presets/fields/atm.json                  |   3 +-
 data/presets/fields/bicycle_parking.json      |   3 +-
 data/presets/fields/building.json             |   3 +-
 data/presets/fields/building_area.json        |   5 +-
 data/presets/fields/building_yes.json         |   5 +-
 data/presets/fields/capacity.json             |   3 +-
 data/presets/fields/collection_times.json     |   3 +-
 data/presets/fields/construction.json         |   3 +-
 data/presets/fields/country.json              |   3 +-
 data/presets/fields/crossing.json             |   5 +-
 data/presets/fields/cuisine.json              |   3 +-
 data/presets/fields/denomination.json         |   3 +-
 data/presets/fields/denotation.json           |   5 +-
 data/presets/fields/elevation.json            |   5 +-
 data/presets/fields/emergency.json            |   3 +-
 data/presets/fields/entrance.json             |   3 +-
 data/presets/fields/fax.json                  |   3 +-
 data/presets/fields/fee.json                  |   3 +-
 data/presets/fields/highway.json              |   5 +-
 data/presets/fields/historic.json             |   5 +-
 data/presets/fields/internet_access.json      |  12 +-
 data/presets/fields/landuse.json              |   5 +-
 data/presets/fields/layer.json                |   3 +-
 data/presets/fields/leisure.json              |   5 +-
 data/presets/fields/levels.json               |   3 +-
 data/presets/fields/man_made.json             |   5 +-
 data/presets/fields/maxspeed.json             |   3 +-
 data/presets/fields/natural.json              |   5 +-
 data/presets/fields/network.json              |   3 +-
 data/presets/fields/note.json                 |   5 +-
 data/presets/fields/office.json               |   5 +-
 data/presets/fields/oneway.json               |   3 +-
 data/presets/fields/opening_hours.json        |   5 +-
 data/presets/fields/operator.json             |   3 +-
 data/presets/fields/phone.json                |   5 +-
 data/presets/fields/place.json                |   5 +-
 data/presets/fields/railway.json              |   5 +-
 data/presets/fields/ref.json                  |   3 +-
 data/presets/fields/religion.json             |  14 +-
 data/presets/fields/service.json              |  11 +-
 data/presets/fields/shelter.json              |   3 +-
 data/presets/fields/shop.json                 |   5 +-
 data/presets/fields/source.json               |   5 +-
 data/presets/fields/sport.json                |   3 +-
 data/presets/fields/structure.json            |  11 +-
 data/presets/fields/surface.json              |   3 +-
 data/presets/fields/tourism.json              |   5 +-
 data/presets/fields/water.json                |   5 +-
 data/presets/fields/waterway.json             |   5 +-
 data/presets/fields/website.json              |   5 +-
 data/presets/fields/wetland.json              |   5 +-
 data/presets/fields/wheelchair.json           |   3 +-
 data/presets/fields/wikipedia.json            |   5 +-
 data/presets/fields/wood.json                 |   5 +-
 data/presets/presets.json                     | 457 ++++++++++++------
 data/presets/presets/aeroway.json             |   3 +-
 data/presets/presets/aeroway/aerodrome.json   |   3 +-
 data/presets/presets/aeroway/helipad.json     |   3 +-
 data/presets/presets/amenity.json             |   3 +-
 data/presets/presets/amenity/bank.json        |   3 +-
 data/presets/presets/amenity/bar.json         |   3 +-
 data/presets/presets/amenity/bench.json       |   3 +-
 .../presets/amenity/bicycle_parking.json      |   3 +-
 .../presets/amenity/bicycle_rental.json       |   3 +-
 data/presets/presets/amenity/cafe.json        |   3 +-
 data/presets/presets/amenity/cinema.json      |   3 +-
 data/presets/presets/amenity/courthouse.json  |   3 +-
 data/presets/presets/amenity/embassy.json     |   3 +-
 data/presets/presets/amenity/fast_food.json   |   3 +-
 .../presets/presets/amenity/fire_station.json |   3 +-
 data/presets/presets/amenity/fuel.json        |   5 +-
 data/presets/presets/amenity/grave_yard.json  |   3 +-
 data/presets/presets/amenity/hospital.json    |   3 +-
 data/presets/presets/amenity/library.json     |   3 +-
 data/presets/presets/amenity/parking.json     |   3 +-
 data/presets/presets/amenity/pharmacy.json    |   3 +-
 .../presets/amenity/place_of_worship.json     |   3 +-
 .../amenity/place_of_worship/christian.json   |   3 +-
 .../amenity/place_of_worship/jewish.json      |   3 +-
 .../amenity/place_of_worship/muslim.json      |   3 +-
 data/presets/presets/amenity/police.json      |   3 +-
 data/presets/presets/amenity/post_box.json    |   3 +-
 data/presets/presets/amenity/post_office.json |   3 +-
 data/presets/presets/amenity/pub.json         |   3 +-
 data/presets/presets/amenity/restaurant.json  |   3 +-
 data/presets/presets/amenity/school.json      |   3 +-
 .../presets/amenity/swimming_pool.json        |   3 +-
 data/presets/presets/amenity/telephone.json   |   3 +-
 data/presets/presets/amenity/theatre.json     |   4 +-
 data/presets/presets/amenity/toilets.json     |   3 +-
 data/presets/presets/amenity/townhall.json    |   3 +-
 data/presets/presets/amenity/university.json  |   3 +-
 data/presets/presets/building.json            |   3 +-
 data/presets/presets/entrance.json            |   3 +-
 data/presets/presets/highway.json             |   3 +-
 data/presets/presets/highway/bus_stop.json    |   3 +-
 data/presets/presets/highway/crossing.json    |   3 +-
 data/presets/presets/highway/cycleway.json    |   3 +-
 data/presets/presets/highway/footway.json     |   5 +-
 data/presets/presets/highway/motorway.json    |   3 +-
 data/presets/presets/highway/path.json        |   3 +-
 data/presets/presets/highway/primary.json     |   3 +-
 data/presets/presets/highway/residential.json |   3 +-
 data/presets/presets/highway/secondary.json   |   3 +-
 data/presets/presets/highway/service.json     |   3 +-
 data/presets/presets/highway/steps.json       |   3 +-
 data/presets/presets/highway/tertiary.json    |   3 +-
 data/presets/presets/highway/track.json       |   3 +-
 .../presets/highway/traffic_signals.json      |   3 +-
 data/presets/presets/highway/trunk.json       |   3 +-
 .../presets/highway/turning_circle.json       |   3 +-
 .../presets/presets/highway/unclassified.json |   3 +-
 data/presets/presets/historic.json            |   3 +-
 data/presets/presets/historic/monument.json   |   3 +-
 data/presets/presets/landuse.json             |   3 +-
 data/presets/presets/landuse/allotments.json  |   3 +-
 data/presets/presets/landuse/basin.json       |   3 +-
 data/presets/presets/landuse/cemetery.json    |   3 +-
 data/presets/presets/landuse/commercial.json  |   3 +-
 .../presets/presets/landuse/construction.json |   3 +-
 data/presets/presets/landuse/farm.json        |   3 +-
 data/presets/presets/landuse/farmyard.json    |   3 +-
 data/presets/presets/landuse/forest.json      |   3 +-
 data/presets/presets/landuse/grass.json       |   3 +-
 data/presets/presets/landuse/industrial.json  |   3 +-
 data/presets/presets/landuse/meadow.json      |   3 +-
 data/presets/presets/landuse/orchard.json     |   3 +-
 data/presets/presets/landuse/quarry.json      |   3 +-
 data/presets/presets/landuse/residential.json |   3 +-
 data/presets/presets/landuse/vineyard.json    |   3 +-
 data/presets/presets/leisure.json             |   3 +-
 data/presets/presets/leisure/garden.json      |   3 +-
 data/presets/presets/leisure/golf_course.json |   3 +-
 data/presets/presets/leisure/park.json        |   3 +-
 data/presets/presets/leisure/pitch.json       |   3 +-
 .../leisure/pitch/american_football.json      |   3 +-
 .../presets/leisure/pitch/baseball.json       |   3 +-
 .../presets/leisure/pitch/basketball.json     |   3 +-
 .../presets/presets/leisure/pitch/soccer.json |   3 +-
 .../presets/presets/leisure/pitch/tennis.json |   3 +-
 data/presets/presets/leisure/playground.json  |   3 +-
 data/presets/presets/leisure/stadium.json     |   3 +-
 .../presets/leisure/swimming_pool.json        |   3 +-
 data/presets/presets/man_made.json            |   3 +-
 data/presets/presets/man_made/lighthouse.json |   3 +-
 data/presets/presets/man_made/pier.json       |   3 +-
 .../presets/man_made/survey_point.json        |   3 +-
 .../presets/presets/man_made/water_tower.json |   3 +-
 data/presets/presets/natural.json             |   3 +-
 data/presets/presets/natural/bay.json         |   3 +-
 data/presets/presets/natural/beach.json       |   3 +-
 data/presets/presets/natural/cliff.json       |   3 +-
 data/presets/presets/natural/coastline.json   |   3 +-
 data/presets/presets/natural/glacier.json     |   3 +-
 data/presets/presets/natural/grassland.json   |   3 +-
 data/presets/presets/natural/heath.json       |   3 +-
 data/presets/presets/natural/peak.json        |   3 +-
 data/presets/presets/natural/scrub.json       |   3 +-
 data/presets/presets/natural/spring.json      |   3 +-
 data/presets/presets/natural/tree.json        |   3 +-
 data/presets/presets/natural/water.json       |   3 +-
 data/presets/presets/natural/water/lake.json  |   3 +-
 data/presets/presets/natural/water/pond.json  |   3 +-
 .../presets/natural/water/reservoir.json      |   3 +-
 data/presets/presets/natural/wetland.json     |   5 +-
 data/presets/presets/natural/wood.json        |   3 +-
 data/presets/presets/office.json              |   3 +-
 data/presets/presets/place.json               |   3 +-
 data/presets/presets/place/hamlet.json        |   3 +-
 data/presets/presets/place/island.json        |   3 +-
 data/presets/presets/place/locality.json      |   3 +-
 data/presets/presets/place/village.json       |   3 +-
 data/presets/presets/power/sub_station.json   |   3 +-
 data/presets/presets/railway.json             |   3 +-
 .../presets/railway/level_crossing.json       |   3 +-
 data/presets/presets/railway/rail.json        |   5 +-
 data/presets/presets/railway/subway.json      |   5 +-
 .../presets/railway/subway_entrance.json      |   3 +-
 data/presets/presets/shop.json                |   3 +-
 data/presets/presets/shop/butcher.json        |   3 +-
 data/presets/presets/shop/supermarket.json    |   3 +-
 data/presets/presets/tourism.json             |   3 +-
 data/presets/presets/tourism/alpine_hut.json  |   3 +-
 data/presets/presets/tourism/artwork.json     |   3 +-
 data/presets/presets/tourism/attraction.json  |   3 +-
 data/presets/presets/tourism/camp_site.json   |   3 +-
 .../presets/presets/tourism/caravan_site.json |   3 +-
 data/presets/presets/tourism/chalet.json      |   3 +-
 data/presets/presets/tourism/guest_house.json |   3 +-
 data/presets/presets/tourism/hostel.json      |   3 +-
 data/presets/presets/tourism/hotel.json       |   3 +-
 data/presets/presets/tourism/information.json |   3 +-
 data/presets/presets/tourism/motel.json       |   3 +-
 data/presets/presets/tourism/museum.json      |   3 +-
 data/presets/presets/tourism/picnic_site.json |   3 +-
 data/presets/presets/tourism/theme_park.json  |   3 +-
 data/presets/presets/tourism/viewpoint.json   |   3 +-
 data/presets/presets/tourism/zoo.json         |   3 +-
 data/presets/presets/waterway.json            |   3 +-
 data/presets/presets/waterway/canal.json      |   3 +-
 data/presets/presets/waterway/dam.json        |   3 +-
 data/presets/presets/waterway/ditch.json      |   3 +-
 data/presets/presets/waterway/drain.json      |   3 +-
 data/presets/presets/waterway/river.json      |   3 +-
 data/presets/presets/waterway/riverbank.json  |   3 +-
 data/presets/presets/waterway/stream.json     |   3 +-
 data/presets/presets/waterway/weir.json       |   3 +-
 214 files changed, 1023 insertions(+), 492 deletions(-)

diff --git a/build.js b/build.js
index 32b705854..4fd70c6f8 100644
--- a/build.js
+++ b/build.js
@@ -1,6 +1,7 @@
 var fs = require('fs'),
     path = require('path'),
-    glob = require('glob');
+    glob = require('glob'),
+    YAML = require('js-yaml');
 
 function read(f) {
     return JSON.parse(fs.readFileSync(f));
@@ -14,18 +15,36 @@ function rp(f) {
     return r('presets/' + f);
 }
 
+var translations = {
+    fields: {},
+    presets: {}
+};
+
 var fields = {};
 glob.sync(__dirname + '/data/presets/fields/*.json').forEach(function(file) {
-    fields[path.basename(file, '.json')] = read(file);
+    var field = read(file),
+        id = path.basename(file, '.json');
+    translations.fields[id] = {label: field.label};
+    if (field.strings) {
+        for (var i in field.strings) {
+            translations.fields[id][i] = field.strings[i];
+        }
+    }
+    fields[id] = field;
 });
 fs.writeFileSync('data/presets/fields.json', JSON.stringify(fields, null, 4));
 
 var presets = {};
 glob.sync(__dirname + '/data/presets/presets/**/*.json').forEach(function(file) {
-    presets[file.match(/presets\/presets\/([^.]*)\.json/)[1]] = read(file);
+    var preset = read(file),
+        id = file.match(/presets\/presets\/([^.]*)\.json/)[1];
+    translations.presets[id] = {name: preset.name};
+    presets[id] = preset;
 });
 fs.writeFileSync('data/presets/presets.json', JSON.stringify(presets, null, 4));
 
+fs.writeFileSync('data/presets.yaml', YAML.dump({en: {presets: translations}}));
+
 fs.writeFileSync('data/data.js', 'iD.data = ' + JSON.stringify({
     deprecated: r('deprecated.json'),
     discarded: r('discarded.json'),
diff --git a/data/presets.yaml b/data/presets.yaml
index b891f0fa2..3fb2a2293 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -30,6 +30,8 @@ en:
         label: Collection Times
       construction: 
         label: Type
+      country: 
+        label: Country
       crossing: 
         label: Type
       cuisine: 
@@ -92,7 +94,7 @@ en:
         label: Type
       railway: 
         label: Type
-      ref:
+      ref: 
         label: Reference
       religion: 
         label: Religion
@@ -104,13 +106,6 @@ en:
           hindu: Hindu
           shinto: Shinto
           taoist: Taoist
-      roadtype: 
-        label: Features
-        options: 
-          bridge: Bridge
-          tunnel: Tunnel
-          embankment: Embankment
-          cutting: Cutting
       service: 
         label: Type
       shelter: 
@@ -121,6 +116,13 @@ en:
         label: Source
       sport: 
         label: Sport
+      structure: 
+        label: Structure
+        options: 
+          bridge: Bridge
+          tunnel: Tunnel
+          embankment: Embankment
+          cutting: Cutting
       surface: 
         label: Surface
       tourism: 
@@ -133,6 +135,8 @@ en:
         label: Website
       wetland: 
         label: Type
+      wheelchair: 
+        label: Wheelchair Access
       wikipedia: 
         label: Wikipedia
       wood: 
@@ -150,7 +154,7 @@ en:
         name: Bank
       amenity/bar: 
         name: Bar
-      amenity/bench:
+      amenity/bench: 
         name: Bench
       amenity/bicycle_parking: 
         name: Bicycle Parking
@@ -160,13 +164,17 @@ en:
         name: Cafe
       amenity/cinema: 
         name: Cinema
+      amenity/courthouse: 
+        name: Courthouse
+      amenity/embassy: 
+        name: Embassy
       amenity/fast_food: 
         name: Fast Food
       amenity/fire_station: 
         name: Fire Station
-      amenity/fuel:
+      amenity/fuel: 
         name: Gas Station
-      amenity/grave_yard:
+      amenity/grave_yard: 
         name: Graveyard
       amenity/hospital: 
         name: Hospital
@@ -196,11 +204,13 @@ en:
         name: Restaurant
       amenity/school: 
         name: School
-      amenity/swimming_pool:
+      amenity/swimming_pool: 
         name: Swimming Pool
-      amenity/telephone:
+      amenity/telephone: 
         name: Telephone
-      amenity/toilets:
+      amenity/theatre: 
+        name: Theater
+      amenity/toilets: 
         name: Toilets
       amenity/townhall: 
         name: Town Hall
@@ -284,7 +294,7 @@ en:
         name: Vineyard
       leisure: 
         name: Leisure
-      leisure/garden:
+      leisure/garden: 
         name: Garden
       leisure/golf_course: 
         name: Golf Course
@@ -304,15 +314,17 @@ en:
         name: Tennis Court
       leisure/playground: 
         name: Playground
-      leisure/swimming_pool:
+      leisure/stadium: 
+        name: Stadium
+      leisure/swimming_pool: 
         name: Swimming Pool
-      man_made:
+      man_made: 
         name: Man Made
       man_made/lighthouse: 
         name: Lighthouse
       man_made/pier: 
         name: Pier
-      man_made/survey_point:
+      man_made/survey_point: 
         name: Survey Point
       man_made/water_tower: 
         name: Water Tower
@@ -384,39 +396,39 @@ en:
         name: Supermarket
       tourism: 
         name: Tourism
-      tourism/alpine_hut:
+      tourism/alpine_hut: 
         name: Alpine Hut
-      tourism/artwork:
+      tourism/artwork: 
         name: Artwork
-      tourism/attraction:
+      tourism/attraction: 
         name: Tourist Attraction
-      tourism/camp_site:
+      tourism/camp_site: 
         name: Camp Site
-      tourism/caravan_site:
+      tourism/caravan_site: 
         name: RV Park
-      tourism/chalet:
+      tourism/chalet: 
         name: Chalet
-      tourism/guest_house:
+      tourism/guest_house: 
         name: Guest House
-      tourism/hostel:
+      tourism/hostel: 
         name: Hostel
-      tourism/hotel:
+      tourism/hotel: 
         name: Hotel
-      tourism/information:
+      tourism/information: 
         name: Information
-      tourism/motel:
+      tourism/motel: 
         name: Motel
-      tourism/museum:
+      tourism/museum: 
         name: Museum
       tourism/picnic_site: 
         name: Picnic Site
-      tourism/theme_park:
+      tourism/theme_park: 
         name: Theme Park
-      tourism/viewpoint:
+      tourism/viewpoint: 
         name: Viewpoint
-      tourism/zoo:
+      tourism/zoo: 
         name: Zoo
-      waterway:
+      waterway: 
         name: Waterway
       waterway/canal: 
         name: Canal
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 4af12766c..74175fc21 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -1,7 +1,8 @@
 {
     "access": {
         "key": "access",
-        "type": "combo"
+        "type": "combo",
+        "label": "Access"
     },
     "address": {
         "type": "address",
@@ -12,101 +13,132 @@
             "addr:city"
         ],
         "icon": "address",
-        "universal": true
+        "universal": true,
+        "label": "Address",
+        "strings": {
+            "placeholders": {
+                "housename": "Housename",
+                "number": "123",
+                "street": "Street",
+                "city": "City"
+            }
+        }
     },
     "aeroway": {
         "key": "aeroway",
-        "type": "combo"
+        "type": "combo",
+        "label": "Type"
     },
     "amenity": {
         "key": "amenity",
-        "type": "combo"
+        "type": "combo",
+        "label": "Type"
     },
     "atm": {
         "key": "atm",
-        "type": "check"
+        "type": "check",
+        "label": "ATM"
     },
     "bicycle_parking": {
         "key": "bicycle_parking",
-        "type": "combo"
+        "type": "combo",
+        "label": "Type"
     },
     "building": {
         "key": "building",
-        "type": "combo"
+        "type": "combo",
+        "label": "Building"
     },
     "building_area": {
         "key": "building",
         "type": "check",
         "default": "yes",
-        "geometry": "area"
+        "geometry": "area",
+        "label": "Building"
     },
     "building_yes": {
         "key": "building",
         "type": "combo",
-        "default": "yes"
+        "default": "yes",
+        "label": "Building"
     },
     "capacity": {
         "key": "capacity",
-        "type": "text"
+        "type": "text",
+        "label": "Capacity"
     },
     "collection_times": {
         "key": "collection_times",
-        "type": "text"
+        "type": "text",
+        "label": "Collection Times"
     },
     "construction": {
         "key": "construction",
-        "type": "combo"
+        "type": "combo",
+        "label": "Type"
     },
     "country": {
         "key": "country",
-        "type": "combo"
+        "type": "combo",
+        "label": "Country"
     },
     "crossing": {
         "key": "crossing",
-        "type": "combo"
+        "type": "combo",
+        "label": "Type"
     },
     "cuisine": {
         "key": "cuisine",
         "type": "combo",
-        "indexed": true
+        "indexed": true,
+        "label": "Cuisine"
     },
     "denomination": {
         "key": "denomination",
-        "type": "combo"
+        "type": "combo",
+        "label": "Denomination"
     },
     "denotation": {
         "key": "denotation",
-        "type": "combo"
+        "type": "combo",
+        "label": "Denotation"
     },
     "elevation": {
         "key": "ele",
         "type": "number",
         "icon": "elevation",
-        "universal": true
+        "universal": true,
+        "label": "Elevation"
     },
     "emergency": {
         "key": "emergency",
-        "type": "check"
+        "type": "check",
+        "label": "Emergency"
     },
     "entrance": {
         "key": "entrance",
-        "type": "combo"
+        "type": "combo",
+        "label": "Type"
     },
     "fax": {
         "key": "fax",
-        "type": "tel"
+        "type": "tel",
+        "label": "Fax"
     },
     "fee": {
         "key": "fee",
-        "type": "check"
+        "type": "check",
+        "label": "Fee"
     },
     "highway": {
         "key": "highway",
-        "type": "combo"
+        "type": "combo",
+        "label": "Type"
     },
     "historic": {
         "key": "historic",
-        "type": "combo"
+        "type": "combo",
+        "label": "Type"
     },
     "internet_access": {
         "key": "internet_access",
@@ -117,79 +149,106 @@
             "wlan",
             "wired",
             "terminal"
-        ]
+        ],
+        "label": "Internet Access",
+        "strings": {
+            "options": {
+                "yes": "Yes",
+                "no": "No",
+                "wlan": "Wifi",
+                "wired": "Wired",
+                "terminal": "Terminal"
+            }
+        }
     },
     "landuse": {
         "key": "landuse",
-        "type": "combo"
+        "type": "combo",
+        "label": "Type"
     },
     "layer": {
         "key": "layer",
-        "type": "combo"
+        "type": "combo",
+        "label": "Layer"
     },
     "leisure": {
         "key": "leisure",
-        "type": "combo"
+        "type": "combo",
+        "label": "Type"
     },
     "levels": {
         "key": "building:levels",
-        "type": "number"
+        "type": "number",
+        "label": "Levels"
     },
     "man_made": {
         "key": "man_made",
-        "type": "combo"
+        "type": "combo",
+        "label": "Type"
     },
     "maxspeed": {
         "key": "maxspeed",
-        "type": "combo"
+        "type": "combo",
+        "label": "Speed Limit"
     },
     "natural": {
         "key": "natural",
-        "type": "combo"
+        "type": "combo",
+        "label": "Natural"
     },
     "network": {
         "key": "network",
-        "type": "text"
+        "type": "text",
+        "label": "Network"
     },
     "note": {
         "key": "note",
         "type": "textarea",
         "universal": true,
-        "icon": "note"
+        "icon": "note",
+        "label": "Note"
     },
     "office": {
         "key": "office",
-        "type": "combo"
+        "type": "combo",
+        "label": "Type"
     },
     "oneway": {
         "key": "oneway",
-        "type": "check"
+        "type": "check",
+        "label": "One Way"
     },
     "opening_hours": {
         "key": "opening_hours",
-        "type": "text"
+        "type": "text",
+        "label": "Hours"
     },
     "operator": {
         "key": "operator",
-        "type": "text"
+        "type": "text",
+        "label": "Operator"
     },
     "phone": {
         "key": "phone",
         "type": "tel",
         "icon": "telephone",
-        "universal": true
+        "universal": true,
+        "label": "Phone"
     },
     "place": {
         "key": "place",
-        "type": "combo"
+        "type": "combo",
+        "label": "Type"
     },
     "railway": {
         "key": "railway",
-        "type": "combo"
+        "type": "combo",
+        "label": "Type"
     },
     "ref": {
         "key": "ref",
-        "type": "text"
+        "type": "text",
+        "label": "Reference"
     },
     "religion": {
         "key": "religion",
@@ -202,7 +261,19 @@
             "hindu",
             "shinto",
             "taoist"
-        ]
+        ],
+        "label": "Religion",
+        "strings": {
+            "options": {
+                "christian": "Christian",
+                "muslim": "Muslim",
+                "buddhist": "Buddhist",
+                "jewish": "Jewish",
+                "hindu": "Hindu",
+                "shinto": "Shinto",
+                "taoist": "Taoist"
+            }
+        }
     },
     "service": {
         "key": "service",
@@ -213,25 +284,30 @@
             "alley",
             "drive-through",
             "emergency_access"
-        ]
+        ],
+        "label": "Type"
     },
     "shelter": {
         "key": "shelter",
-        "type": "check"
+        "type": "check",
+        "label": "Shelter"
     },
     "shop": {
         "key": "shop",
-        "type": "combo"
+        "type": "combo",
+        "label": "Type"
     },
     "source": {
         "key": "source",
         "type": "text",
         "icon": "source",
-        "universal": true
+        "universal": true,
+        "label": "Source"
     },
     "sport": {
         "key": "sport",
-        "type": "combo"
+        "type": "combo",
+        "label": "Sport"
     },
     "structure": {
         "type": "radio",
@@ -240,33 +316,48 @@
             "tunnel",
             "embankment",
             "cutting"
-        ]
+        ],
+        "label": "Structure",
+        "strings": {
+            "options": {
+                "bridge": "Bridge",
+                "tunnel": "Tunnel",
+                "embankment": "Embankment",
+                "cutting": "Cutting"
+            }
+        }
     },
     "surface": {
         "key": "surface",
-        "type": "combo"
+        "type": "combo",
+        "label": "Surface"
     },
     "tourism": {
         "key": "tourism",
-        "type": "combo"
+        "type": "combo",
+        "label": "Type"
     },
     "water": {
         "key": "water",
-        "type": "combo"
+        "type": "combo",
+        "label": "Type"
     },
     "waterway": {
         "key": "waterway",
-        "type": "combo"
+        "type": "combo",
+        "label": "Type"
     },
     "website": {
         "key": "website",
         "type": "url",
         "icon": "website",
-        "universal": true
+        "universal": true,
+        "label": "Website"
     },
     "wetland": {
         "key": "wetland",
-        "type": "combo"
+        "type": "combo",
+        "label": "Type"
     },
     "wheelchair": {
         "key": "wheelchair",
@@ -277,16 +368,19 @@
             "no"
         ],
         "icon": "wheelchair",
-        "universal": "true"
+        "universal": "true",
+        "label": "Wheelchair Access"
     },
     "wikipedia": {
         "key": "wikipedia",
         "type": "text",
         "icon": "wikipedia",
-        "universal": true
+        "universal": true,
+        "label": "Wikipedia"
     },
     "wood": {
         "key": "wood",
-        "type": "combo"
+        "type": "combo",
+        "label": "Type"
     }
 }
\ No newline at end of file
diff --git a/data/presets/fields/access.json b/data/presets/fields/access.json
index 4d880a5c9..0243f6cbb 100644
--- a/data/presets/fields/access.json
+++ b/data/presets/fields/access.json
@@ -1,4 +1,5 @@
 {
     "key": "access",
-    "type": "combo"
+    "type": "combo",
+    "label": "Access"
 }
\ No newline at end of file
diff --git a/data/presets/fields/address.json b/data/presets/fields/address.json
index 4c7f93cee..87e1d7f91 100644
--- a/data/presets/fields/address.json
+++ b/data/presets/fields/address.json
@@ -7,5 +7,14 @@
         "addr:city"
     ],
     "icon": "address",
-    "universal": true
-}
+    "universal": true,
+    "label": "Address",
+    "strings": {
+        "placeholders": {
+          "housename": "Housename",
+          "number": "123",
+          "street": "Street",
+          "city": "City"
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/presets/fields/aeroway.json b/data/presets/fields/aeroway.json
index 759fed213..a7d73294a 100644
--- a/data/presets/fields/aeroway.json
+++ b/data/presets/fields/aeroway.json
@@ -1,4 +1,5 @@
 {
     "key": "aeroway",
-    "type": "combo"
-}
+    "type": "combo",
+    "label": "Type"
+}
\ No newline at end of file
diff --git a/data/presets/fields/amenity.json b/data/presets/fields/amenity.json
index 1ead3431b..e18911da4 100644
--- a/data/presets/fields/amenity.json
+++ b/data/presets/fields/amenity.json
@@ -1,4 +1,5 @@
 {
     "key": "amenity",
-    "type": "combo"
-}
+    "type": "combo",
+    "label": "Type"
+}
\ No newline at end of file
diff --git a/data/presets/fields/atm.json b/data/presets/fields/atm.json
index ed808c72a..4f2407aa3 100644
--- a/data/presets/fields/atm.json
+++ b/data/presets/fields/atm.json
@@ -1,4 +1,5 @@
 {
     "key": "atm",
-    "type": "check"
+    "type": "check",
+    "label": "ATM"
 }
\ No newline at end of file
diff --git a/data/presets/fields/bicycle_parking.json b/data/presets/fields/bicycle_parking.json
index ad6568aa9..29a86726e 100644
--- a/data/presets/fields/bicycle_parking.json
+++ b/data/presets/fields/bicycle_parking.json
@@ -1,4 +1,5 @@
 {
     "key": "bicycle_parking",
-    "type": "combo"
+    "type": "combo",
+    "label": "Type"
 }
\ No newline at end of file
diff --git a/data/presets/fields/building.json b/data/presets/fields/building.json
index 87257d332..5325c1f26 100644
--- a/data/presets/fields/building.json
+++ b/data/presets/fields/building.json
@@ -1,4 +1,5 @@
 {
     "key": "building",
-    "type": "combo"
+    "type": "combo",
+    "label": "Building"
 }
\ No newline at end of file
diff --git a/data/presets/fields/building_area.json b/data/presets/fields/building_area.json
index b720dd89d..025529051 100644
--- a/data/presets/fields/building_area.json
+++ b/data/presets/fields/building_area.json
@@ -2,5 +2,6 @@
     "key": "building",
     "type": "check",
     "default": "yes",
-    "geometry": "area"
-}
+    "geometry": "area",
+    "label": "Building"
+}
\ No newline at end of file
diff --git a/data/presets/fields/building_yes.json b/data/presets/fields/building_yes.json
index ac496a7ff..6a61a665f 100644
--- a/data/presets/fields/building_yes.json
+++ b/data/presets/fields/building_yes.json
@@ -1,5 +1,6 @@
 {
     "key": "building",
     "type": "combo",
-    "default": "yes"
-}
+    "default": "yes",
+    "label": "Building"
+}
\ No newline at end of file
diff --git a/data/presets/fields/capacity.json b/data/presets/fields/capacity.json
index 350193bab..b7ad08432 100644
--- a/data/presets/fields/capacity.json
+++ b/data/presets/fields/capacity.json
@@ -1,4 +1,5 @@
 {
     "key": "capacity",
-    "type": "text"
+    "type": "text",
+    "label": "Capacity"
 }
\ No newline at end of file
diff --git a/data/presets/fields/collection_times.json b/data/presets/fields/collection_times.json
index 4b094bf9a..698cdf480 100644
--- a/data/presets/fields/collection_times.json
+++ b/data/presets/fields/collection_times.json
@@ -1,4 +1,5 @@
 {
     "key": "collection_times",
-    "type": "text"
+    "type": "text",
+    "label": "Collection Times"
 }
\ No newline at end of file
diff --git a/data/presets/fields/construction.json b/data/presets/fields/construction.json
index 15b1ac099..9f0b92806 100644
--- a/data/presets/fields/construction.json
+++ b/data/presets/fields/construction.json
@@ -1,4 +1,5 @@
 {
     "key": "construction",
-    "type": "combo"
+    "type": "combo",
+    "label": "Type"
 }
\ No newline at end of file
diff --git a/data/presets/fields/country.json b/data/presets/fields/country.json
index 602883d2b..3ad365da4 100644
--- a/data/presets/fields/country.json
+++ b/data/presets/fields/country.json
@@ -1,4 +1,5 @@
 {
     "key": "country",
-    "type": "combo"
+    "type": "combo",
+    "label": "Country"
 }
diff --git a/data/presets/fields/crossing.json b/data/presets/fields/crossing.json
index bcab9943f..4f22b29e0 100644
--- a/data/presets/fields/crossing.json
+++ b/data/presets/fields/crossing.json
@@ -1,4 +1,5 @@
 {
     "key": "crossing",
-    "type": "combo"
-}
+    "type": "combo",
+    "label": "Type"
+}
\ No newline at end of file
diff --git a/data/presets/fields/cuisine.json b/data/presets/fields/cuisine.json
index 0895fdbc6..654b05302 100644
--- a/data/presets/fields/cuisine.json
+++ b/data/presets/fields/cuisine.json
@@ -1,5 +1,6 @@
 {
     "key": "cuisine",
     "type": "combo",
-    "indexed": true
+    "indexed": true,
+    "label": "Cuisine"
 }
\ No newline at end of file
diff --git a/data/presets/fields/denomination.json b/data/presets/fields/denomination.json
index b3ee85ffa..a4a24ca9d 100644
--- a/data/presets/fields/denomination.json
+++ b/data/presets/fields/denomination.json
@@ -1,4 +1,5 @@
 {
     "key": "denomination",
-    "type": "combo"
+    "type": "combo",
+    "label": "Denomination"
 }
\ No newline at end of file
diff --git a/data/presets/fields/denotation.json b/data/presets/fields/denotation.json
index fe40efb25..7482de721 100644
--- a/data/presets/fields/denotation.json
+++ b/data/presets/fields/denotation.json
@@ -1,4 +1,5 @@
 {
     "key": "denotation",
-    "type": "combo"
-}
+    "type": "combo",
+    "label": "Denotation"
+}
\ No newline at end of file
diff --git a/data/presets/fields/elevation.json b/data/presets/fields/elevation.json
index 20e13e415..9a09db321 100644
--- a/data/presets/fields/elevation.json
+++ b/data/presets/fields/elevation.json
@@ -2,5 +2,6 @@
     "key": "ele",
     "type": "number",
     "icon": "elevation",
-    "universal": true
-}
+    "universal": true,
+    "label": "Elevation"
+}
\ No newline at end of file
diff --git a/data/presets/fields/emergency.json b/data/presets/fields/emergency.json
index aa58e9f80..359109bbb 100644
--- a/data/presets/fields/emergency.json
+++ b/data/presets/fields/emergency.json
@@ -1,4 +1,5 @@
 {
     "key": "emergency",
-    "type": "check"
+    "type": "check",
+    "label": "Emergency"
 }
\ No newline at end of file
diff --git a/data/presets/fields/entrance.json b/data/presets/fields/entrance.json
index f2e5c1b02..392264e9f 100644
--- a/data/presets/fields/entrance.json
+++ b/data/presets/fields/entrance.json
@@ -1,4 +1,5 @@
 {
     "key": "entrance",
-    "type": "combo"
+    "type": "combo",
+    "label": "Type"
 }
\ No newline at end of file
diff --git a/data/presets/fields/fax.json b/data/presets/fields/fax.json
index c63497c3c..e000d8f42 100644
--- a/data/presets/fields/fax.json
+++ b/data/presets/fields/fax.json
@@ -1,4 +1,5 @@
 {
     "key": "fax",
-    "type": "tel"
+    "type": "tel",
+    "label": "Fax"
 }
\ No newline at end of file
diff --git a/data/presets/fields/fee.json b/data/presets/fields/fee.json
index d2ef7da4a..33dc526c4 100644
--- a/data/presets/fields/fee.json
+++ b/data/presets/fields/fee.json
@@ -1,4 +1,5 @@
 {
     "key": "fee",
-    "type": "check"
+    "type": "check",
+    "label": "Fee"
 }
\ No newline at end of file
diff --git a/data/presets/fields/highway.json b/data/presets/fields/highway.json
index 793b3ec07..61618eeae 100644
--- a/data/presets/fields/highway.json
+++ b/data/presets/fields/highway.json
@@ -1,4 +1,5 @@
 {
     "key": "highway",
-    "type": "combo"
-}
+    "type": "combo",
+    "label": "Type"
+}
\ No newline at end of file
diff --git a/data/presets/fields/historic.json b/data/presets/fields/historic.json
index e84291fab..178a571ca 100644
--- a/data/presets/fields/historic.json
+++ b/data/presets/fields/historic.json
@@ -1,4 +1,5 @@
 {
     "key": "historic",
-    "type": "combo"
-}
+    "type": "combo",
+    "label": "Type"
+}
\ No newline at end of file
diff --git a/data/presets/fields/internet_access.json b/data/presets/fields/internet_access.json
index f8e7ae72e..2a0db4f5b 100644
--- a/data/presets/fields/internet_access.json
+++ b/data/presets/fields/internet_access.json
@@ -7,5 +7,15 @@
         "wlan",
         "wired",
         "terminal"
-    ]
+    ],
+    "label": "Internet Access",
+    "strings": {
+        "options": {
+            "yes": "Yes",
+            "no": "No",
+            "wlan": "Wifi",
+            "wired": "Wired",
+            "terminal": "Terminal"
+        }
+    }
 }
\ No newline at end of file
diff --git a/data/presets/fields/landuse.json b/data/presets/fields/landuse.json
index 10a4ed623..5054b30af 100644
--- a/data/presets/fields/landuse.json
+++ b/data/presets/fields/landuse.json
@@ -1,4 +1,5 @@
 {
     "key": "landuse",
-    "type": "combo"
-}
+    "type": "combo",
+    "label": "Type"
+}
\ No newline at end of file
diff --git a/data/presets/fields/layer.json b/data/presets/fields/layer.json
index 162dbfeb9..d66d60c0a 100644
--- a/data/presets/fields/layer.json
+++ b/data/presets/fields/layer.json
@@ -1,4 +1,5 @@
 {
     "key": "layer",
-    "type": "combo"
+    "type": "combo",
+    "label": "Layer"
 }
\ No newline at end of file
diff --git a/data/presets/fields/leisure.json b/data/presets/fields/leisure.json
index c13cd02e1..9697ac2bc 100644
--- a/data/presets/fields/leisure.json
+++ b/data/presets/fields/leisure.json
@@ -1,4 +1,5 @@
 {
     "key": "leisure",
-    "type": "combo"
-}
+    "type": "combo",
+    "label": "Type"
+}
\ No newline at end of file
diff --git a/data/presets/fields/levels.json b/data/presets/fields/levels.json
index 75e50864f..5f1279ec1 100644
--- a/data/presets/fields/levels.json
+++ b/data/presets/fields/levels.json
@@ -1,4 +1,5 @@
 {
     "key": "building:levels",
-    "type": "number"
+    "type": "number",
+    "label": "Levels"
 }
\ No newline at end of file
diff --git a/data/presets/fields/man_made.json b/data/presets/fields/man_made.json
index dba446547..930ea0462 100644
--- a/data/presets/fields/man_made.json
+++ b/data/presets/fields/man_made.json
@@ -1,4 +1,5 @@
 {
     "key": "man_made",
-    "type": "combo"
-}
+    "type": "combo",
+    "label": "Type"
+}
\ No newline at end of file
diff --git a/data/presets/fields/maxspeed.json b/data/presets/fields/maxspeed.json
index cb8e160f2..270f967db 100644
--- a/data/presets/fields/maxspeed.json
+++ b/data/presets/fields/maxspeed.json
@@ -1,4 +1,5 @@
 {
     "key": "maxspeed",
-    "type": "combo"
+    "type": "combo",
+    "label": "Speed Limit"
 }
\ No newline at end of file
diff --git a/data/presets/fields/natural.json b/data/presets/fields/natural.json
index d9431624c..ce95a7533 100644
--- a/data/presets/fields/natural.json
+++ b/data/presets/fields/natural.json
@@ -1,4 +1,5 @@
 {
     "key": "natural",
-    "type": "combo"
-}
+    "type": "combo",
+    "label": "Natural"
+}
\ No newline at end of file
diff --git a/data/presets/fields/network.json b/data/presets/fields/network.json
index 8c997e65a..3c07eb997 100644
--- a/data/presets/fields/network.json
+++ b/data/presets/fields/network.json
@@ -1,4 +1,5 @@
 {
     "key": "network",
-    "type": "text"
+    "type": "text",
+    "label": "Network"
 }
\ No newline at end of file
diff --git a/data/presets/fields/note.json b/data/presets/fields/note.json
index 7bc9af9ce..e38d9d5d7 100644
--- a/data/presets/fields/note.json
+++ b/data/presets/fields/note.json
@@ -2,5 +2,6 @@
     "key": "note",
     "type": "textarea",
     "universal": true,
-    "icon": "note"
-}
+    "icon": "note",
+    "label": "Note"
+}
\ No newline at end of file
diff --git a/data/presets/fields/office.json b/data/presets/fields/office.json
index 8e926713f..de00631a5 100644
--- a/data/presets/fields/office.json
+++ b/data/presets/fields/office.json
@@ -1,4 +1,5 @@
 {
     "key": "office",
-    "type": "combo"
-}
+    "type": "combo",
+    "label": "Type"
+}
\ No newline at end of file
diff --git a/data/presets/fields/oneway.json b/data/presets/fields/oneway.json
index 490e9fb8b..459b61c2e 100644
--- a/data/presets/fields/oneway.json
+++ b/data/presets/fields/oneway.json
@@ -1,4 +1,5 @@
 {
     "key": "oneway",
-    "type": "check"
+    "type": "check",
+    "label": "One Way"
 }
\ No newline at end of file
diff --git a/data/presets/fields/opening_hours.json b/data/presets/fields/opening_hours.json
index 58763fe17..73605a678 100644
--- a/data/presets/fields/opening_hours.json
+++ b/data/presets/fields/opening_hours.json
@@ -1,4 +1,5 @@
 {
     "key": "opening_hours",
-    "type": "text"
-}
+    "type": "text",
+    "label": "Hours"
+}
\ No newline at end of file
diff --git a/data/presets/fields/operator.json b/data/presets/fields/operator.json
index 4d63e6501..893e74156 100644
--- a/data/presets/fields/operator.json
+++ b/data/presets/fields/operator.json
@@ -1,4 +1,5 @@
 {
     "key": "operator",
-    "type": "text"
+    "type": "text",
+    "label": "Operator"
 }
\ No newline at end of file
diff --git a/data/presets/fields/phone.json b/data/presets/fields/phone.json
index dcd931c05..ebf063c0f 100644
--- a/data/presets/fields/phone.json
+++ b/data/presets/fields/phone.json
@@ -2,5 +2,6 @@
     "key": "phone",
     "type": "tel",
     "icon": "telephone",
-    "universal": true
-}
+    "universal": true,
+    "label": "Phone"
+}
\ No newline at end of file
diff --git a/data/presets/fields/place.json b/data/presets/fields/place.json
index 94158b057..4d08fd8cf 100644
--- a/data/presets/fields/place.json
+++ b/data/presets/fields/place.json
@@ -1,4 +1,5 @@
 {
     "key": "place",
-    "type": "combo"
-}
+    "type": "combo",
+    "label": "Type"
+}
\ No newline at end of file
diff --git a/data/presets/fields/railway.json b/data/presets/fields/railway.json
index 3ac49417d..0fee3d7bf 100644
--- a/data/presets/fields/railway.json
+++ b/data/presets/fields/railway.json
@@ -1,4 +1,5 @@
 {
     "key": "railway",
-    "type": "combo"
-}
+    "type": "combo",
+    "label": "Type"
+}
\ No newline at end of file
diff --git a/data/presets/fields/ref.json b/data/presets/fields/ref.json
index be81c49a0..f84d90025 100644
--- a/data/presets/fields/ref.json
+++ b/data/presets/fields/ref.json
@@ -1,4 +1,5 @@
 {
     "key": "ref",
-    "type": "text"
+    "type": "text",
+    "label": "Reference"
 }
\ No newline at end of file
diff --git a/data/presets/fields/religion.json b/data/presets/fields/religion.json
index f912f09f3..8e44ad1d8 100644
--- a/data/presets/fields/religion.json
+++ b/data/presets/fields/religion.json
@@ -9,5 +9,17 @@
         "hindu",
         "shinto",
         "taoist"
-    ]
+    ],
+    "label": "Religion",
+    "strings": {
+        "options": {
+          "christian": "Christian",
+          "muslim": "Muslim",
+          "buddhist": "Buddhist",
+          "jewish": "Jewish",
+          "hindu": "Hindu",
+          "shinto": "Shinto",
+          "taoist": "Taoist"
+        }
+    }
 }
\ No newline at end of file
diff --git a/data/presets/fields/service.json b/data/presets/fields/service.json
index b21da8b3f..ca5eefa2b 100644
--- a/data/presets/fields/service.json
+++ b/data/presets/fields/service.json
@@ -1,5 +1,12 @@
 {
     "key": "service",
     "type": "combo",
-    "options": ["parking_aisle", "driveway", "alley", "drive-through", "emergency_access"]
-}
+    "options": [
+        "parking_aisle",
+        "driveway",
+        "alley",
+        "drive-through",
+        "emergency_access"
+    ],
+    "label": "Type"
+}
\ No newline at end of file
diff --git a/data/presets/fields/shelter.json b/data/presets/fields/shelter.json
index 521a8dc47..d9676394d 100644
--- a/data/presets/fields/shelter.json
+++ b/data/presets/fields/shelter.json
@@ -1,4 +1,5 @@
 {
     "key": "shelter",
-    "type": "check"
+    "type": "check",
+    "label": "Shelter"
 }
\ No newline at end of file
diff --git a/data/presets/fields/shop.json b/data/presets/fields/shop.json
index c29d4154e..97e3abda2 100644
--- a/data/presets/fields/shop.json
+++ b/data/presets/fields/shop.json
@@ -1,4 +1,5 @@
 {
     "key": "shop",
-    "type": "combo"
-}
+    "type": "combo",
+    "label": "Type"
+}
\ No newline at end of file
diff --git a/data/presets/fields/source.json b/data/presets/fields/source.json
index 6f360b2c4..0cad9fa73 100644
--- a/data/presets/fields/source.json
+++ b/data/presets/fields/source.json
@@ -2,5 +2,6 @@
     "key": "source",
     "type": "text",
     "icon": "source",
-    "universal": true
-}
+    "universal": true,
+    "label": "Source"
+}
\ No newline at end of file
diff --git a/data/presets/fields/sport.json b/data/presets/fields/sport.json
index 2acb062e6..cc83a5c07 100644
--- a/data/presets/fields/sport.json
+++ b/data/presets/fields/sport.json
@@ -1,4 +1,5 @@
 {
     "key": "sport",
-    "type": "combo"
+    "type": "combo",
+    "label": "Sport"
 }
\ No newline at end of file
diff --git a/data/presets/fields/structure.json b/data/presets/fields/structure.json
index f509e0695..8ea1b28ea 100644
--- a/data/presets/fields/structure.json
+++ b/data/presets/fields/structure.json
@@ -5,5 +5,14 @@
         "tunnel",
         "embankment",
         "cutting"
-    ]
+    ],
+    "label": "Structure",
+    "strings": {
+        "options": {
+            "bridge": "Bridge",
+            "tunnel": "Tunnel",
+            "embankment": "Embankment",
+            "cutting": "Cutting"
+        }
+    }
 }
diff --git a/data/presets/fields/surface.json b/data/presets/fields/surface.json
index 0ec8555d8..615db54aa 100644
--- a/data/presets/fields/surface.json
+++ b/data/presets/fields/surface.json
@@ -1,4 +1,5 @@
 {
     "key": "surface",
-    "type": "combo"
+    "type": "combo",
+    "label": "Surface"
 }
\ No newline at end of file
diff --git a/data/presets/fields/tourism.json b/data/presets/fields/tourism.json
index 29af88d47..b5ddd4a91 100644
--- a/data/presets/fields/tourism.json
+++ b/data/presets/fields/tourism.json
@@ -1,4 +1,5 @@
 {
     "key": "tourism",
-    "type": "combo"
-}
+    "type": "combo",
+    "label": "Type"
+}
\ No newline at end of file
diff --git a/data/presets/fields/water.json b/data/presets/fields/water.json
index 1e52dfb4e..03e160633 100644
--- a/data/presets/fields/water.json
+++ b/data/presets/fields/water.json
@@ -1,4 +1,5 @@
 {
     "key": "water",
-    "type": "combo"
-}
+    "type": "combo",
+    "label": "Type"
+}
\ No newline at end of file
diff --git a/data/presets/fields/waterway.json b/data/presets/fields/waterway.json
index 6b6c3dc3a..e7fff8dca 100644
--- a/data/presets/fields/waterway.json
+++ b/data/presets/fields/waterway.json
@@ -1,4 +1,5 @@
 {
     "key": "waterway",
-    "type": "combo"
-}
+    "type": "combo",
+    "label": "Type"
+}
\ No newline at end of file
diff --git a/data/presets/fields/website.json b/data/presets/fields/website.json
index 28a58084a..90e1cd1d1 100644
--- a/data/presets/fields/website.json
+++ b/data/presets/fields/website.json
@@ -2,5 +2,6 @@
     "key": "website",
     "type": "url",
     "icon": "website",
-    "universal": true
-}
+    "universal": true,
+    "label": "Website"
+}
\ No newline at end of file
diff --git a/data/presets/fields/wetland.json b/data/presets/fields/wetland.json
index ebe839a1e..bf1037181 100644
--- a/data/presets/fields/wetland.json
+++ b/data/presets/fields/wetland.json
@@ -1,4 +1,5 @@
 {
     "key": "wetland",
-    "type": "combo"
-}
+    "type": "combo",
+    "label": "Type"
+}
\ No newline at end of file
diff --git a/data/presets/fields/wheelchair.json b/data/presets/fields/wheelchair.json
index d7893d90e..7003c7c17 100644
--- a/data/presets/fields/wheelchair.json
+++ b/data/presets/fields/wheelchair.json
@@ -7,5 +7,6 @@
         "no"
     ],
     "icon": "wheelchair",
-    "universal": "true"
+    "universal": "true",
+    "label": "Wheelchair Access"
 }
diff --git a/data/presets/fields/wikipedia.json b/data/presets/fields/wikipedia.json
index 16910d086..034b83928 100644
--- a/data/presets/fields/wikipedia.json
+++ b/data/presets/fields/wikipedia.json
@@ -2,5 +2,6 @@
     "key": "wikipedia",
     "type": "text",
     "icon": "wikipedia",
-    "universal": true
-}
+    "universal": true,
+    "label": "Wikipedia"
+}
\ No newline at end of file
diff --git a/data/presets/fields/wood.json b/data/presets/fields/wood.json
index cfd5bac29..f9ed5c6f7 100644
--- a/data/presets/fields/wood.json
+++ b/data/presets/fields/wood.json
@@ -1,4 +1,5 @@
 {
     "key": "wood",
-    "type": "combo"
-}
+    "type": "combo",
+    "label": "Type"
+}
\ No newline at end of file
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 95b6122f2..4406b34c8 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -11,7 +11,8 @@
         ],
         "tags": {
             "aeroway": "*"
-        }
+        },
+        "name": "Aeroway"
     },
     "aeroway/aerodrome": {
         "icon": "airport",
@@ -26,7 +27,8 @@
         ],
         "tags": {
             "aeroway": "aerodrome"
-        }
+        },
+        "name": "Airport"
     },
     "aeroway/helipad": {
         "icon": "heliport",
@@ -41,7 +43,8 @@
         ],
         "tags": {
             "aeroway": "helipad"
-        }
+        },
+        "name": "Helipad"
     },
     "amenity": {
         "fields": [
@@ -54,7 +57,8 @@
         ],
         "tags": {
             "amenity": "*"
-        }
+        },
+        "name": "Amenity"
     },
     "amenity/bank": {
         "icon": "bank",
@@ -93,7 +97,8 @@
         ],
         "tags": {
             "amenity": "bank"
-        }
+        },
+        "name": "Bank"
     },
     "amenity/bar": {
         "icon": "bar",
@@ -109,7 +114,8 @@
         "tags": {
             "amenity": "bar"
         },
-        "terms": []
+        "terms": [],
+        "name": "Bar"
     },
     "amenity/bench": {
         "geometry": [
@@ -119,7 +125,8 @@
         ],
         "tags": {
             "amenity": "bench"
-        }
+        },
+        "name": "Bench"
     },
     "amenity/bicycle_parking": {
         "icon": "bicycle",
@@ -135,7 +142,8 @@
         ],
         "tags": {
             "amenity": "bicycle_parking"
-        }
+        },
+        "name": "Bicycle Parking"
     },
     "amenity/bicycle_rental": {
         "icon": "bicycle",
@@ -151,7 +159,8 @@
         ],
         "tags": {
             "amenity": "bicycle_rental"
-        }
+        },
+        "name": "Bicycle Rental"
     },
     "amenity/cafe": {
         "icon": "cafe",
@@ -173,7 +182,8 @@
         ],
         "tags": {
             "amenity": "cafe"
-        }
+        },
+        "name": "Cafe"
     },
     "amenity/cinema": {
         "icon": "cinema",
@@ -207,7 +217,8 @@
         ],
         "tags": {
             "amenity": "cinema"
-        }
+        },
+        "name": "Cinema"
     },
     "amenity/courthouse": {
         "fields": [
@@ -222,7 +233,8 @@
         ],
         "tags": {
             "amenity": "courthouse"
-        }
+        },
+        "name": "Courthouse"
     },
     "amenity/embassy": {
         "geometry": [
@@ -235,7 +247,8 @@
         "fields": [
             "country"
         ],
-        "icon": "embassy"
+        "icon": "embassy",
+        "name": "Embassy"
     },
     "amenity/fast_food": {
         "icon": "fast-food",
@@ -252,7 +265,8 @@
         "tags": {
             "amenity": "fast_food"
         },
-        "terms": []
+        "terms": [],
+        "name": "Fast Food"
     },
     "amenity/fire_station": {
         "icon": "fire-station",
@@ -269,7 +283,8 @@
         "tags": {
             "amenity": "fire_station"
         },
-        "terms": []
+        "terms": [],
+        "name": "Fire Station"
     },
     "amenity/fuel": {
         "icon": "fuel",
@@ -284,7 +299,8 @@
         ],
         "tags": {
             "amenity": "fuel"
-        }
+        },
+        "name": "Gas Station"
     },
     "amenity/grave_yard": {
         "icon": "cemetery",
@@ -298,7 +314,8 @@
         ],
         "tags": {
             "amenity": "grave_yard"
-        }
+        },
+        "name": "Graveyard"
     },
     "amenity/hospital": {
         "icon": "hospital",
@@ -329,7 +346,8 @@
         ],
         "tags": {
             "amenity": "hospital"
-        }
+        },
+        "name": "Hospital"
     },
     "amenity/library": {
         "icon": "library",
@@ -346,7 +364,8 @@
         "tags": {
             "amenity": "library"
         },
-        "terms": []
+        "terms": [],
+        "name": "Library"
     },
     "amenity/parking": {
         "icon": "parking",
@@ -363,7 +382,8 @@
         "tags": {
             "amenity": "parking"
         },
-        "terms": []
+        "terms": [],
+        "name": "Parking"
     },
     "amenity/pharmacy": {
         "icon": "pharmacy",
@@ -380,7 +400,8 @@
         "tags": {
             "amenity": "pharmacy"
         },
-        "terms": []
+        "terms": [],
+        "name": "Pharmacy"
     },
     "amenity/place_of_worship": {
         "icon": "place-of-worship",
@@ -422,7 +443,8 @@
         ],
         "tags": {
             "amenity": "place_of_worship"
-        }
+        },
+        "name": "Place of Worship"
     },
     "amenity/place_of_worship/christian": {
         "icon": "religious-christian",
@@ -463,7 +485,8 @@
         "tags": {
             "amenity": "place_of_worship",
             "religion": "christian"
-        }
+        },
+        "name": "Church"
     },
     "amenity/place_of_worship/jewish": {
         "icon": "religious-jewish",
@@ -484,7 +507,8 @@
         "tags": {
             "amenity": "place_of_worship",
             "religion": "jewish"
-        }
+        },
+        "name": "Synagogue"
     },
     "amenity/place_of_worship/muslim": {
         "icon": "religious-muslim",
@@ -505,7 +529,8 @@
         "tags": {
             "amenity": "place_of_worship",
             "religion": "muslim"
-        }
+        },
+        "name": "Mosque"
     },
     "amenity/police": {
         "icon": "police",
@@ -551,7 +576,8 @@
         ],
         "tags": {
             "amenity": "police"
-        }
+        },
+        "name": "Police"
     },
     "amenity/post_box": {
         "icon": "post",
@@ -573,7 +599,8 @@
             "mailbox",
             "pillar box",
             "postbox"
-        ]
+        ],
+        "name": "Mailbox"
     },
     "amenity/post_office": {
         "icon": "post",
@@ -588,7 +615,8 @@
         ],
         "tags": {
             "amenity": "post_office"
-        }
+        },
+        "name": "Post Office"
     },
     "amenity/pub": {
         "icon": "beer",
@@ -604,7 +632,8 @@
         "tags": {
             "amenity": "pub"
         },
-        "terms": []
+        "terms": [],
+        "name": "Pub"
     },
     "amenity/restaurant": {
         "icon": "restaurant",
@@ -653,7 +682,8 @@
         ],
         "tags": {
             "amenity": "restaurant"
-        }
+        },
+        "name": "Restaurant"
     },
     "amenity/school": {
         "icon": "school",
@@ -687,7 +717,8 @@
         ],
         "tags": {
             "amenity": "school"
-        }
+        },
+        "name": "School"
     },
     "amenity/swimming_pool": {
         "geometry": [
@@ -699,7 +730,8 @@
             "amenity": "swimming_pool"
         },
         "icon": "swimming",
-        "searchable": false
+        "searchable": false,
+        "name": "Swimming Pool"
     },
     "amenity/telephone": {
         "geometry": [
@@ -708,7 +740,8 @@
         ],
         "tags": {
             "amenity": "telephone"
-        }
+        },
+        "name": "Telephone"
     },
     "amenity/theatre": {
         "icon": "theatre",
@@ -723,13 +756,15 @@
             "area"
         ],
         "terms": [
+            "theatre",
             "performance",
             "play",
             "musical"
         ],
         "tags": {
             "amenity": "theatre"
-        }
+        },
+        "name": "Theater"
     },
     "amenity/toilets": {
         "fields": [
@@ -744,7 +779,8 @@
         "terms": [],
         "tags": {
             "amenity": "toilets"
-        }
+        },
+        "name": "Toilets"
     },
     "amenity/townhall": {
         "icon": "town-hall",
@@ -766,7 +802,8 @@
         ],
         "tags": {
             "amenity": "townhall"
-        }
+        },
+        "name": "Town Hall"
     },
     "amenity/university": {
         "icon": "college",
@@ -782,7 +819,8 @@
         "tags": {
             "amenity": "university"
         },
-        "terms": []
+        "terms": [],
+        "name": "University"
     },
     "building": {
         "icon": "warehouse",
@@ -804,7 +842,8 @@
         "tags": {
             "building": "*"
         },
-        "terms": []
+        "terms": [],
+        "name": "Building"
     },
     "entrance": {
         "geometry": [
@@ -815,7 +854,8 @@
         },
         "fields": [
             "entrance"
-        ]
+        ],
+        "name": "Entrance"
     },
     "highway": {
         "fields": [
@@ -829,7 +869,8 @@
         ],
         "tags": {
             "highway": "*"
-        }
+        },
+        "name": "Highway"
     },
     "highway/bus_stop": {
         "icon": "bus",
@@ -844,7 +885,8 @@
         "tags": {
             "highway": "bus_stop"
         },
-        "terms": []
+        "terms": [],
+        "name": "Bus Stop"
     },
     "highway/crossing": {
         "fields": [
@@ -859,7 +901,8 @@
         "terms": [
             "crosswalk",
             "zebra crossing"
-        ]
+        ],
+        "name": "Crossing"
     },
     "highway/cycleway": {
         "icon": "highway-cycleway",
@@ -875,7 +918,8 @@
         "tags": {
             "highway": "cycleway"
         },
-        "terms": []
+        "terms": [],
+        "name": "Cycle Path"
     },
     "highway/footway": {
         "icon": "highway-footway",
@@ -915,7 +959,8 @@
         ],
         "tags": {
             "highway": "footway"
-        }
+        },
+        "name": "Foot Path"
     },
     "highway/motorway": {
         "icon": "highway-motorway",
@@ -932,7 +977,8 @@
         "tags": {
             "highway": "motorway"
         },
-        "terms": []
+        "terms": [],
+        "name": "Motorway"
     },
     "highway/path": {
         "icon": "highway-footway",
@@ -949,7 +995,8 @@
         "tags": {
             "highway": "path"
         },
-        "terms": []
+        "terms": [],
+        "name": "Path"
     },
     "highway/primary": {
         "icon": "highway-primary",
@@ -966,7 +1013,8 @@
         "tags": {
             "highway": "primary"
         },
-        "terms": []
+        "terms": [],
+        "name": "Primary Road"
     },
     "highway/residential": {
         "icon": "highway-residential",
@@ -983,7 +1031,8 @@
         "tags": {
             "highway": "residential"
         },
-        "terms": []
+        "terms": [],
+        "name": "Residential Road"
     },
     "highway/secondary": {
         "icon": "highway-secondary",
@@ -1000,7 +1049,8 @@
         "tags": {
             "highway": "secondary"
         },
-        "terms": []
+        "terms": [],
+        "name": "Secondary Road"
     },
     "highway/service": {
         "icon": "highway-service",
@@ -1018,7 +1068,8 @@
         "tags": {
             "highway": "service"
         },
-        "terms": []
+        "terms": [],
+        "name": "Service Road"
     },
     "highway/steps": {
         "fields": [
@@ -1034,7 +1085,8 @@
         "terms": [
             "stairs",
             "staircase"
-        ]
+        ],
+        "name": "Steps"
     },
     "highway/tertiary": {
         "icon": "highway-tertiary",
@@ -1051,7 +1103,8 @@
         "tags": {
             "highway": "tertiary"
         },
-        "terms": []
+        "terms": [],
+        "name": "Tertiary Road"
     },
     "highway/track": {
         "icon": "highway-track",
@@ -1068,7 +1121,8 @@
         "tags": {
             "highway": "track"
         },
-        "terms": []
+        "terms": [],
+        "name": "Track"
     },
     "highway/traffic_signals": {
         "geometry": [
@@ -1081,7 +1135,8 @@
             "light",
             "stoplight",
             "traffic light"
-        ]
+        ],
+        "name": "Traffic Signals"
     },
     "highway/trunk": {
         "icon": "highway-trunk",
@@ -1098,7 +1153,8 @@
         "tags": {
             "highway": "trunk"
         },
-        "terms": []
+        "terms": [],
+        "name": "Trunk Road"
     },
     "highway/turning_circle": {
         "icon": "circle",
@@ -1108,7 +1164,8 @@
         "tags": {
             "highway": "turning_circle"
         },
-        "terms": []
+        "terms": [],
+        "name": "Turning Circle"
     },
     "highway/unclassified": {
         "icon": "highway",
@@ -1125,7 +1182,8 @@
         "tags": {
             "highway": "unclassified"
         },
-        "terms": []
+        "terms": [],
+        "name": "Unclassified Road"
     },
     "historic": {
         "fields": [
@@ -1138,7 +1196,8 @@
         ],
         "tags": {
             "historic": "*"
-        }
+        },
+        "name": "Historic Site"
     },
     "historic/monument": {
         "icon": "monument",
@@ -1149,7 +1208,8 @@
         ],
         "tags": {
             "historic": "monument"
-        }
+        },
+        "name": "Monument"
     },
     "landuse": {
         "fields": [
@@ -1162,7 +1222,8 @@
         ],
         "tags": {
             "landuse": "*"
-        }
+        },
+        "name": "Landuse"
     },
     "landuse/allotments": {
         "geometry": [
@@ -1172,7 +1233,8 @@
         "tags": {
             "landuse": "allotments"
         },
-        "terms": []
+        "terms": [],
+        "name": "Allotments"
     },
     "landuse/basin": {
         "geometry": [
@@ -1182,7 +1244,8 @@
         "tags": {
             "landuse": "basin"
         },
-        "terms": []
+        "terms": [],
+        "name": "Basin"
     },
     "landuse/cemetery": {
         "icon": "cemetery",
@@ -1193,7 +1256,8 @@
         "tags": {
             "landuse": "cemetery"
         },
-        "terms": []
+        "terms": [],
+        "name": "Cemetery"
     },
     "landuse/commercial": {
         "geometry": [
@@ -1203,7 +1267,8 @@
         "tags": {
             "landuse": "commercial"
         },
-        "terms": []
+        "terms": [],
+        "name": "Commercial"
     },
     "landuse/construction": {
         "fields": [
@@ -1217,7 +1282,8 @@
         "tags": {
             "landuse": "construction"
         },
-        "terms": []
+        "terms": [],
+        "name": "Construction"
     },
     "landuse/farm": {
         "geometry": [
@@ -1227,7 +1293,8 @@
         "tags": {
             "landuse": "farm"
         },
-        "terms": []
+        "terms": [],
+        "name": "Farm"
     },
     "landuse/farmyard": {
         "geometry": [
@@ -1237,7 +1304,8 @@
         "tags": {
             "landuse": "farmyard"
         },
-        "terms": []
+        "terms": [],
+        "name": "Farmyard"
     },
     "landuse/forest": {
         "fields": [
@@ -1251,7 +1319,8 @@
         "tags": {
             "landuse": "forest"
         },
-        "terms": []
+        "terms": [],
+        "name": "Forest"
     },
     "landuse/grass": {
         "geometry": [
@@ -1261,7 +1330,8 @@
         "tags": {
             "landuse": "grass"
         },
-        "terms": []
+        "terms": [],
+        "name": "Grass"
     },
     "landuse/industrial": {
         "geometry": [
@@ -1271,7 +1341,8 @@
         "tags": {
             "landuse": "industrial"
         },
-        "terms": []
+        "terms": [],
+        "name": "Industrial"
     },
     "landuse/meadow": {
         "geometry": [
@@ -1281,7 +1352,8 @@
         "tags": {
             "landuse": "meadow"
         },
-        "terms": []
+        "terms": [],
+        "name": "Meadow"
     },
     "landuse/orchard": {
         "geometry": [
@@ -1291,7 +1363,8 @@
         "tags": {
             "landuse": "orchard"
         },
-        "terms": []
+        "terms": [],
+        "name": "Orchard"
     },
     "landuse/quarry": {
         "geometry": [
@@ -1301,7 +1374,8 @@
         "tags": {
             "landuse": "quarry"
         },
-        "terms": []
+        "terms": [],
+        "name": "Quarry"
     },
     "landuse/residential": {
         "geometry": [
@@ -1311,7 +1385,8 @@
         "tags": {
             "landuse": "residential"
         },
-        "terms": []
+        "terms": [],
+        "name": "Residential"
     },
     "landuse/vineyard": {
         "geometry": [
@@ -1321,7 +1396,8 @@
         "tags": {
             "landuse": "vineyard"
         },
-        "terms": []
+        "terms": [],
+        "name": "Vineyard"
     },
     "leisure": {
         "fields": [
@@ -1334,7 +1410,8 @@
         ],
         "tags": {
             "leisure": "*"
-        }
+        },
+        "name": "Leisure"
     },
     "leisure/garden": {
         "icon": "garden",
@@ -1345,7 +1422,8 @@
         ],
         "tags": {
             "leisure": "garden"
-        }
+        },
+        "name": "Garden"
     },
     "leisure/golf_course": {
         "icon": "golf",
@@ -1360,7 +1438,8 @@
         "tags": {
             "leisure": "golf_course"
         },
-        "terms": []
+        "terms": [],
+        "name": "Golf Course"
     },
     "leisure/park": {
         "icon": "park",
@@ -1392,7 +1471,8 @@
         ],
         "tags": {
             "leisure": "park"
-        }
+        },
+        "name": "Park"
     },
     "leisure/pitch": {
         "icon": "pitch",
@@ -1407,7 +1487,8 @@
         "tags": {
             "leisure": "pitch"
         },
-        "terms": []
+        "terms": [],
+        "name": "Sport Pitch"
     },
     "leisure/pitch/american_football": {
         "icon": "america-football",
@@ -1422,7 +1503,8 @@
             "leisure": "pitch",
             "sport": "american_football"
         },
-        "terms": []
+        "terms": [],
+        "name": "American Football Field"
     },
     "leisure/pitch/baseball": {
         "icon": "baseball",
@@ -1434,7 +1516,8 @@
             "leisure": "pitch",
             "sport": "baseball"
         },
-        "terms": []
+        "terms": [],
+        "name": "Baseball Diamond"
     },
     "leisure/pitch/basketball": {
         "icon": "basketball",
@@ -1449,7 +1532,8 @@
             "leisure": "pitch",
             "sport": "basketball"
         },
-        "terms": []
+        "terms": [],
+        "name": "Basketball Court"
     },
     "leisure/pitch/soccer": {
         "icon": "soccer",
@@ -1464,7 +1548,8 @@
             "leisure": "pitch",
             "sport": "soccer"
         },
-        "terms": []
+        "terms": [],
+        "name": "Soccer Field"
     },
     "leisure/pitch/tennis": {
         "icon": "tennis",
@@ -1479,7 +1564,8 @@
             "leisure": "pitch",
             "sport": "tennis"
         },
-        "terms": []
+        "terms": [],
+        "name": "Tennis Court"
     },
     "leisure/playground": {
         "geometry": [
@@ -1488,7 +1574,8 @@
         ],
         "tags": {
             "leisure": "playground"
-        }
+        },
+        "name": "Playground"
     },
     "leisure/stadium": {
         "geometry": [
@@ -1500,7 +1587,8 @@
         },
         "fields": [
             "sport"
-        ]
+        ],
+        "name": "Stadium"
     },
     "leisure/swimming_pool": {
         "geometry": [
@@ -1511,7 +1599,8 @@
         "tags": {
             "leisure": "swimming_pool"
         },
-        "icon": "swimming"
+        "icon": "swimming",
+        "name": "Swimming Pool"
     },
     "man_made": {
         "fields": [
@@ -1525,7 +1614,8 @@
         ],
         "tags": {
             "man_made": "*"
-        }
+        },
+        "name": "Man Made"
     },
     "man_made/lighthouse": {
         "geometry": [
@@ -1534,7 +1624,8 @@
         ],
         "tags": {
             "man_made": "lighthouse"
-        }
+        },
+        "name": "Lighthouse"
     },
     "man_made/pier": {
         "geometry": [
@@ -1543,7 +1634,8 @@
         ],
         "tags": {
             "man_made": "pier"
-        }
+        },
+        "name": "Pier"
     },
     "man_made/survey_point": {
         "icon": "monument",
@@ -1556,7 +1648,8 @@
         },
         "fields": [
             "ref"
-        ]
+        ],
+        "name": "Survey Point"
     },
     "man_made/water_tower": {
         "icon": "water",
@@ -1566,7 +1659,8 @@
         ],
         "tags": {
             "man_made": "water_tower"
-        }
+        },
+        "name": "Water Tower"
     },
     "natural": {
         "fields": [
@@ -1579,7 +1673,8 @@
         ],
         "tags": {
             "natural": "*"
-        }
+        },
+        "name": "Natural"
     },
     "natural/bay": {
         "geometry": [
@@ -1589,7 +1684,8 @@
         "terms": [],
         "tags": {
             "natural": "bay"
-        }
+        },
+        "name": "Bay"
     },
     "natural/beach": {
         "fields": [
@@ -1602,7 +1698,8 @@
         "terms": [],
         "tags": {
             "natural": "beach"
-        }
+        },
+        "name": "Beach"
     },
     "natural/cliff": {
         "geometry": [
@@ -1614,7 +1711,8 @@
         "terms": [],
         "tags": {
             "natural": "cliff"
-        }
+        },
+        "name": "Cliff"
     },
     "natural/coastline": {
         "geometry": [
@@ -1625,7 +1723,8 @@
         ],
         "tags": {
             "natural": "coastline"
-        }
+        },
+        "name": "Coastline"
     },
     "natural/glacier": {
         "geometry": [
@@ -1634,7 +1733,8 @@
         "terms": [],
         "tags": {
             "natural": "glacier"
-        }
+        },
+        "name": "Glacier"
     },
     "natural/grassland": {
         "geometry": [
@@ -1644,7 +1744,8 @@
         "terms": [],
         "tags": {
             "natural": "grassland"
-        }
+        },
+        "name": "Grassland"
     },
     "natural/heath": {
         "geometry": [
@@ -1653,7 +1754,8 @@
         "terms": [],
         "tags": {
             "natural": "heath"
-        }
+        },
+        "name": "Heath"
     },
     "natural/peak": {
         "icon": "triangle",
@@ -1681,7 +1783,8 @@
             "summit",
             "tip",
             "top"
-        ]
+        ],
+        "name": "Peak"
     },
     "natural/scrub": {
         "geometry": [
@@ -1690,7 +1793,8 @@
         "tags": {
             "natural": "scrub"
         },
-        "terms": []
+        "terms": [],
+        "name": "Scrub"
     },
     "natural/spring": {
         "geometry": [
@@ -1700,7 +1804,8 @@
         "terms": [],
         "tags": {
             "natural": "spring"
-        }
+        },
+        "name": "Spring"
     },
     "natural/tree": {
         "fields": [
@@ -1714,7 +1819,8 @@
         "terms": [],
         "tags": {
             "natural": "tree"
-        }
+        },
+        "name": "Tree"
     },
     "natural/water": {
         "fields": [
@@ -1726,7 +1832,8 @@
         "tags": {
             "natural": "water"
         },
-        "icon": "water"
+        "icon": "water",
+        "name": "Water"
     },
     "natural/water/lake": {
         "geometry": [
@@ -1741,7 +1848,8 @@
             "loch",
             "mere"
         ],
-        "icon": "water"
+        "icon": "water",
+        "name": "Lake"
     },
     "natural/water/pond": {
         "geometry": [
@@ -1758,7 +1866,8 @@
             "pool",
             "mere"
         ],
-        "icon": "water"
+        "icon": "water",
+        "name": "Pond"
     },
     "natural/water/reservoir": {
         "geometry": [
@@ -1768,7 +1877,8 @@
             "natural": "water",
             "water": "reservoir"
         },
-        "icon": "water"
+        "icon": "water",
+        "name": "Reservoir"
     },
     "natural/wetland": {
         "icon": "wetland",
@@ -1782,7 +1892,8 @@
         "tags": {
             "natural": "wetland"
         },
-        "terms": []
+        "terms": [],
+        "name": "Wetland"
     },
     "natural/wood": {
         "fields": [
@@ -1796,7 +1907,8 @@
         "tags": {
             "natural": "wood"
         },
-        "terms": []
+        "terms": [],
+        "name": "Wood"
     },
     "office": {
         "icon": "commercial",
@@ -1813,7 +1925,8 @@
         "tags": {
             "office": "*"
         },
-        "terms": []
+        "terms": [],
+        "name": "Office"
     },
     "place": {
         "fields": [
@@ -1826,7 +1939,8 @@
         ],
         "tags": {
             "place": "*"
-        }
+        },
+        "name": "Place"
     },
     "place/hamlet": {
         "icon": "triangle-stroked",
@@ -1836,7 +1950,8 @@
         ],
         "tags": {
             "place": "hamlet"
-        }
+        },
+        "name": "Hamlet"
     },
     "place/island": {
         "geometry": [
@@ -1855,7 +1970,8 @@
         ],
         "tags": {
             "place": "island"
-        }
+        },
+        "name": "Island"
     },
     "place/locality": {
         "icon": "marker",
@@ -1865,7 +1981,8 @@
         ],
         "tags": {
             "place": "locality"
-        }
+        },
+        "name": "Locality"
     },
     "place/village": {
         "icon": "square-stroked",
@@ -1875,7 +1992,8 @@
         ],
         "tags": {
             "place": "village"
-        }
+        },
+        "name": "Village"
     },
     "power/sub_station": {
         "fields": [
@@ -1887,7 +2005,8 @@
         ],
         "tags": {
             "power": "substation"
-        }
+        },
+        "name": "Substation"
     },
     "railway": {
         "fields": [
@@ -1901,7 +2020,8 @@
         ],
         "tags": {
             "railway": "*"
-        }
+        },
+        "name": "Railway"
     },
     "railway/level_crossing": {
         "icon": "cross",
@@ -1918,7 +2038,8 @@
             "grade crossing",
             "road through railroad",
             "train crossing"
-        ]
+        ],
+        "name": "Level Crossing"
     },
     "railway/rail": {
         "icon": "railway-rail",
@@ -1931,7 +2052,8 @@
         "fields": [
             "structure"
         ],
-        "terms": []
+        "terms": [],
+        "name": "Rail"
     },
     "railway/subway": {
         "icon": "railway-rail",
@@ -1944,7 +2066,8 @@
         "tags": {
             "railway": "subway"
         },
-        "terms": []
+        "terms": [],
+        "name": "Subway"
     },
     "railway/subway_entrance": {
         "icon": "rail-underground",
@@ -1954,7 +2077,8 @@
         "tags": {
             "railway": "subway_entrance"
         },
-        "terms": []
+        "terms": [],
+        "name": "Subway Entrance"
     },
     "shop": {
         "icon": "shop",
@@ -1971,7 +2095,8 @@
         "tags": {
             "shop": "*"
         },
-        "terms": []
+        "terms": [],
+        "name": "Shop"
     },
     "shop/butcher": {
         "icon": "slaughterhouse",
@@ -1987,7 +2112,8 @@
         "terms": [],
         "tags": {
             "shop": "butcher"
-        }
+        },
+        "name": "Butcher"
     },
     "shop/supermarket": {
         "icon": "grocery",
@@ -2025,7 +2151,8 @@
         ],
         "tags": {
             "shop": "supermarket"
-        }
+        },
+        "name": "Supermarket"
     },
     "tourism": {
         "fields": [
@@ -2038,7 +2165,8 @@
         ],
         "tags": {
             "tourism": "*"
-        }
+        },
+        "name": "Tourism"
     },
     "tourism/alpine_hut": {
         "icon": "lodging",
@@ -2053,7 +2181,8 @@
         ],
         "tags": {
             "tourism": "alpine_hut"
-        }
+        },
+        "name": "Alpine Hut"
     },
     "tourism/artwork": {
         "geometry": [
@@ -2064,7 +2193,8 @@
         ],
         "tags": {
             "tourism": "artwork"
-        }
+        },
+        "name": "Artwork"
     },
     "tourism/attraction": {
         "fields": [
@@ -2078,7 +2208,8 @@
         ],
         "tags": {
             "tourism": "attraction"
-        }
+        },
+        "name": "Tourist Attraction"
     },
     "tourism/camp_site": {
         "icon": "campsite",
@@ -2094,7 +2225,8 @@
         "terms": [],
         "tags": {
             "tourism": "camp_site"
-        }
+        },
+        "name": "Camp Site"
     },
     "tourism/caravan_site": {
         "fields": [
@@ -2108,7 +2240,8 @@
         ],
         "tags": {
             "tourism": "caravan_site"
-        }
+        },
+        "name": "RV Park"
     },
     "tourism/chalet": {
         "icon": "lodging",
@@ -2124,7 +2257,8 @@
         ],
         "tags": {
             "tourism": "chalet"
-        }
+        },
+        "name": "Chalet"
     },
     "tourism/guest_house": {
         "icon": "lodging",
@@ -2144,7 +2278,8 @@
             "B&B",
             "Bed & Breakfast",
             "Bed and Breakfast"
-        ]
+        ],
+        "name": "Guest House"
     },
     "tourism/hostel": {
         "icon": "lodging",
@@ -2160,7 +2295,8 @@
         ],
         "tags": {
             "tourism": "hostel"
-        }
+        },
+        "name": "Hostel"
     },
     "tourism/hotel": {
         "icon": "lodging",
@@ -2177,7 +2313,8 @@
         "terms": [],
         "tags": {
             "tourism": "hotel"
-        }
+        },
+        "name": "Hotel"
     },
     "tourism/information": {
         "fields": [
@@ -2191,7 +2328,8 @@
         ],
         "tags": {
             "tourism": "information"
-        }
+        },
+        "name": "Information"
     },
     "tourism/motel": {
         "icon": "lodging",
@@ -2207,7 +2345,8 @@
         ],
         "tags": {
             "tourism": "motel"
-        }
+        },
+        "name": "Motel"
     },
     "tourism/museum": {
         "icon": "museum",
@@ -2238,7 +2377,8 @@
         ],
         "tags": {
             "tourism": "museum"
-        }
+        },
+        "name": "Museum"
     },
     "tourism/picnic_site": {
         "fields": [
@@ -2254,7 +2394,8 @@
         "terms": [],
         "tags": {
             "tourism": "picnic_site"
-        }
+        },
+        "name": "Picnic Site"
     },
     "tourism/theme_park": {
         "fields": [
@@ -2269,7 +2410,8 @@
         ],
         "tags": {
             "tourism": "theme_park"
-        }
+        },
+        "name": "Theme Park"
     },
     "tourism/viewpoint": {
         "geometry": [
@@ -2278,7 +2420,8 @@
         ],
         "tags": {
             "tourism": "viewpoint"
-        }
+        },
+        "name": "Viewpoint"
     },
     "tourism/zoo": {
         "icon": "zoo",
@@ -2293,7 +2436,8 @@
         ],
         "tags": {
             "tourism": "zoo"
-        }
+        },
+        "name": "Zoo"
     },
     "waterway": {
         "fields": [
@@ -2307,7 +2451,8 @@
         ],
         "tags": {
             "waterway": "*"
-        }
+        },
+        "name": "Waterway"
     },
     "waterway/canal": {
         "icon": "waterway-river",
@@ -2316,7 +2461,8 @@
         ],
         "tags": {
             "waterway": "canal"
-        }
+        },
+        "name": "Canal"
     },
     "waterway/dam": {
         "icon": "dam",
@@ -2328,7 +2474,8 @@
         ],
         "tags": {
             "waterway": "dam"
-        }
+        },
+        "name": "Dam"
     },
     "waterway/ditch": {
         "icon": "waterway-river",
@@ -2337,7 +2484,8 @@
         ],
         "tags": {
             "waterway": "ditch"
-        }
+        },
+        "name": "Ditch"
     },
     "waterway/drain": {
         "icon": "waterway-river",
@@ -2346,7 +2494,8 @@
         ],
         "tags": {
             "waterway": "drain"
-        }
+        },
+        "name": "Drain"
     },
     "waterway/river": {
         "icon": "waterway-river",
@@ -2370,7 +2519,8 @@
         ],
         "tags": {
             "waterway": "river"
-        }
+        },
+        "name": "River"
     },
     "waterway/riverbank": {
         "icon": "water",
@@ -2379,7 +2529,8 @@
         ],
         "tags": {
             "waterway": "riverbank"
-        }
+        },
+        "name": "Riverbank"
     },
     "waterway/stream": {
         "icon": "waterway-river",
@@ -2418,7 +2569,8 @@
         ],
         "tags": {
             "waterway": "stream"
-        }
+        },
+        "name": "Stream"
     },
     "waterway/weir": {
         "icon": "dam",
@@ -2428,6 +2580,7 @@
         ],
         "tags": {
             "waterway": "weir"
-        }
+        },
+        "name": "Weir"
     }
 }
\ No newline at end of file
diff --git a/data/presets/presets/aeroway.json b/data/presets/presets/aeroway.json
index a7cd66cfb..efe792627 100644
--- a/data/presets/presets/aeroway.json
+++ b/data/presets/presets/aeroway.json
@@ -10,5 +10,6 @@
     ],
     "tags": {
         "aeroway": "*"
-    }
+    },
+    "name": "Aeroway"
 }
\ No newline at end of file
diff --git a/data/presets/presets/aeroway/aerodrome.json b/data/presets/presets/aeroway/aerodrome.json
index eb3d02a16..e1756619e 100644
--- a/data/presets/presets/aeroway/aerodrome.json
+++ b/data/presets/presets/aeroway/aerodrome.json
@@ -11,5 +11,6 @@
     ],
     "tags": {
         "aeroway": "aerodrome"
-    }
+    },
+    "name": "Airport"
 }
\ No newline at end of file
diff --git a/data/presets/presets/aeroway/helipad.json b/data/presets/presets/aeroway/helipad.json
index 00bea4400..96eba12e1 100644
--- a/data/presets/presets/aeroway/helipad.json
+++ b/data/presets/presets/aeroway/helipad.json
@@ -11,5 +11,6 @@
     ],
     "tags": {
         "aeroway": "helipad"
-    }
+    },
+    "name": "Helipad"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity.json b/data/presets/presets/amenity.json
index 459895ffb..005551387 100644
--- a/data/presets/presets/amenity.json
+++ b/data/presets/presets/amenity.json
@@ -9,5 +9,6 @@
     ],
     "tags": {
         "amenity": "*"
-    }
+    },
+    "name": "Amenity"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/bank.json b/data/presets/presets/amenity/bank.json
index 922d20573..7dc1fc3f7 100644
--- a/data/presets/presets/amenity/bank.json
+++ b/data/presets/presets/amenity/bank.json
@@ -35,5 +35,6 @@
     ],
     "tags": {
         "amenity": "bank"
-    }
+    },
+    "name": "Bank"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/bar.json b/data/presets/presets/amenity/bar.json
index 434670e41..134390ae1 100644
--- a/data/presets/presets/amenity/bar.json
+++ b/data/presets/presets/amenity/bar.json
@@ -12,5 +12,6 @@
     "tags": {
         "amenity": "bar"
     },
-    "terms": []
+    "terms": [],
+    "name": "Bar"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/bench.json b/data/presets/presets/amenity/bench.json
index 67723614e..937c30e80 100644
--- a/data/presets/presets/amenity/bench.json
+++ b/data/presets/presets/amenity/bench.json
@@ -6,5 +6,6 @@
     ],
     "tags": {
         "amenity": "bench"
-    }
+    },
+    "name": "Bench"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/bicycle_parking.json b/data/presets/presets/amenity/bicycle_parking.json
index d1336d00e..1bd7e314d 100644
--- a/data/presets/presets/amenity/bicycle_parking.json
+++ b/data/presets/presets/amenity/bicycle_parking.json
@@ -12,5 +12,6 @@
     ],
     "tags": {
         "amenity": "bicycle_parking"
-    }
+    },
+    "name": "Bicycle Parking"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/bicycle_rental.json b/data/presets/presets/amenity/bicycle_rental.json
index 08cb7d920..adc58e6b9 100644
--- a/data/presets/presets/amenity/bicycle_rental.json
+++ b/data/presets/presets/amenity/bicycle_rental.json
@@ -12,5 +12,6 @@
     ],
     "tags": {
         "amenity": "bicycle_rental"
-    }
+    },
+    "name": "Bicycle Rental"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/cafe.json b/data/presets/presets/amenity/cafe.json
index 1a3d8ed4c..f569d020f 100644
--- a/data/presets/presets/amenity/cafe.json
+++ b/data/presets/presets/amenity/cafe.json
@@ -18,5 +18,6 @@
     ],
     "tags": {
         "amenity": "cafe"
-    }
+    },
+    "name": "Cafe"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/cinema.json b/data/presets/presets/amenity/cinema.json
index 7f4d7acf1..e3fc68351 100644
--- a/data/presets/presets/amenity/cinema.json
+++ b/data/presets/presets/amenity/cinema.json
@@ -30,5 +30,6 @@
     ],
     "tags": {
         "amenity": "cinema"
-    }
+    },
+    "name": "Cinema"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/courthouse.json b/data/presets/presets/amenity/courthouse.json
index 3aec2ed5d..cc6e1165f 100644
--- a/data/presets/presets/amenity/courthouse.json
+++ b/data/presets/presets/amenity/courthouse.json
@@ -11,5 +11,6 @@
     ],
     "tags": {
         "amenity": "courthouse"
-    }
+    },
+    "name": "Courthouse"
 }
diff --git a/data/presets/presets/amenity/embassy.json b/data/presets/presets/amenity/embassy.json
index d6b20f7d3..f79aae6b6 100644
--- a/data/presets/presets/amenity/embassy.json
+++ b/data/presets/presets/amenity/embassy.json
@@ -9,5 +9,6 @@
     "fields": [
         "country"
     ],
-    "icon": "embassy"
+    "icon": "embassy",
+    "name": "Embassy"
 }
diff --git a/data/presets/presets/amenity/fast_food.json b/data/presets/presets/amenity/fast_food.json
index f588de764..bbd386293 100644
--- a/data/presets/presets/amenity/fast_food.json
+++ b/data/presets/presets/amenity/fast_food.json
@@ -13,5 +13,6 @@
     "tags": {
         "amenity": "fast_food"
     },
-    "terms": []
+    "terms": [],
+    "name": "Fast Food"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/fire_station.json b/data/presets/presets/amenity/fire_station.json
index ee7ca5432..8d4853c8e 100644
--- a/data/presets/presets/amenity/fire_station.json
+++ b/data/presets/presets/amenity/fire_station.json
@@ -13,5 +13,6 @@
     "tags": {
         "amenity": "fire_station"
     },
-    "terms": []
+    "terms": [],
+    "name": "Fire Station"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/fuel.json b/data/presets/presets/amenity/fuel.json
index 0f37661d4..eab11eef6 100644
--- a/data/presets/presets/amenity/fuel.json
+++ b/data/presets/presets/amenity/fuel.json
@@ -11,5 +11,6 @@
     ],
     "tags": {
         "amenity": "fuel"
-    }
-}
+    },
+    "name": "Gas Station"
+}
\ No newline at end of file
diff --git a/data/presets/presets/amenity/grave_yard.json b/data/presets/presets/amenity/grave_yard.json
index 072d127eb..d6adbc112 100644
--- a/data/presets/presets/amenity/grave_yard.json
+++ b/data/presets/presets/amenity/grave_yard.json
@@ -10,5 +10,6 @@
     ],
     "tags": {
         "amenity": "grave_yard"
-    }
+    },
+    "name": "Graveyard"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/hospital.json b/data/presets/presets/amenity/hospital.json
index 12f4c4385..0d3fc108d 100644
--- a/data/presets/presets/amenity/hospital.json
+++ b/data/presets/presets/amenity/hospital.json
@@ -27,5 +27,6 @@
     ],
     "tags": {
         "amenity": "hospital"
-    }
+    },
+    "name": "Hospital"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/library.json b/data/presets/presets/amenity/library.json
index ffe839816..bd42427db 100644
--- a/data/presets/presets/amenity/library.json
+++ b/data/presets/presets/amenity/library.json
@@ -13,5 +13,6 @@
     "tags": {
         "amenity": "library"
     },
-    "terms": []
+    "terms": [],
+    "name": "Library"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/parking.json b/data/presets/presets/amenity/parking.json
index ff969c924..c1f99d512 100644
--- a/data/presets/presets/amenity/parking.json
+++ b/data/presets/presets/amenity/parking.json
@@ -13,5 +13,6 @@
     "tags": {
         "amenity": "parking"
     },
-    "terms": []
+    "terms": [],
+    "name": "Parking"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/pharmacy.json b/data/presets/presets/amenity/pharmacy.json
index d739ec05a..f3d7ce761 100644
--- a/data/presets/presets/amenity/pharmacy.json
+++ b/data/presets/presets/amenity/pharmacy.json
@@ -13,5 +13,6 @@
     "tags": {
         "amenity": "pharmacy"
     },
-    "terms": []
+    "terms": [],
+    "name": "Pharmacy"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/place_of_worship.json b/data/presets/presets/amenity/place_of_worship.json
index 9efc1aaac..3f69d9624 100644
--- a/data/presets/presets/amenity/place_of_worship.json
+++ b/data/presets/presets/amenity/place_of_worship.json
@@ -38,5 +38,6 @@
     ],
     "tags": {
         "amenity": "place_of_worship"
-    }
+    },
+    "name": "Place of Worship"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/place_of_worship/christian.json b/data/presets/presets/amenity/place_of_worship/christian.json
index d23ac6042..e9ebdad70 100644
--- a/data/presets/presets/amenity/place_of_worship/christian.json
+++ b/data/presets/presets/amenity/place_of_worship/christian.json
@@ -37,5 +37,6 @@
     "tags": {
         "amenity": "place_of_worship",
         "religion": "christian"
-    }
+    },
+    "name": "Church"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/place_of_worship/jewish.json b/data/presets/presets/amenity/place_of_worship/jewish.json
index e3d8ea200..a432c9f1f 100644
--- a/data/presets/presets/amenity/place_of_worship/jewish.json
+++ b/data/presets/presets/amenity/place_of_worship/jewish.json
@@ -17,5 +17,6 @@
     "tags": {
         "amenity": "place_of_worship",
         "religion": "jewish"
-    }
+    },
+    "name": "Synagogue"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/place_of_worship/muslim.json b/data/presets/presets/amenity/place_of_worship/muslim.json
index 4d9466116..f9eb2ac6a 100644
--- a/data/presets/presets/amenity/place_of_worship/muslim.json
+++ b/data/presets/presets/amenity/place_of_worship/muslim.json
@@ -17,5 +17,6 @@
     "tags": {
         "amenity": "place_of_worship",
         "religion": "muslim"
-    }
+    },
+    "name": "Mosque"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/police.json b/data/presets/presets/amenity/police.json
index 6901714ae..1b3b68f55 100644
--- a/data/presets/presets/amenity/police.json
+++ b/data/presets/presets/amenity/police.json
@@ -42,5 +42,6 @@
     ],
     "tags": {
         "amenity": "police"
-    }
+    },
+    "name": "Police"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/post_box.json b/data/presets/presets/amenity/post_box.json
index df202eb97..0e7eecf2f 100644
--- a/data/presets/presets/amenity/post_box.json
+++ b/data/presets/presets/amenity/post_box.json
@@ -18,5 +18,6 @@
         "mailbox",
         "pillar box",
         "postbox"
-    ]
+    ],
+    "name": "Mailbox"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/post_office.json b/data/presets/presets/amenity/post_office.json
index d67d1b359..4520f9060 100644
--- a/data/presets/presets/amenity/post_office.json
+++ b/data/presets/presets/amenity/post_office.json
@@ -11,5 +11,6 @@
     ],
     "tags": {
         "amenity": "post_office"
-    }
+    },
+    "name": "Post Office"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/pub.json b/data/presets/presets/amenity/pub.json
index 79be287ec..6fd709f22 100644
--- a/data/presets/presets/amenity/pub.json
+++ b/data/presets/presets/amenity/pub.json
@@ -12,5 +12,6 @@
     "tags": {
         "amenity": "pub"
     },
-    "terms": []
+    "terms": [],
+    "name": "Pub"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/restaurant.json b/data/presets/presets/amenity/restaurant.json
index 568c23389..9bd09757c 100644
--- a/data/presets/presets/amenity/restaurant.json
+++ b/data/presets/presets/amenity/restaurant.json
@@ -45,5 +45,6 @@
     ],
     "tags": {
         "amenity": "restaurant"
-    }
+    },
+    "name": "Restaurant"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/school.json b/data/presets/presets/amenity/school.json
index 4dde95ada..8cdbde054 100644
--- a/data/presets/presets/amenity/school.json
+++ b/data/presets/presets/amenity/school.json
@@ -30,5 +30,6 @@
     ],
     "tags": {
         "amenity": "school"
-    }
+    },
+    "name": "School"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/swimming_pool.json b/data/presets/presets/amenity/swimming_pool.json
index 7cc329dc0..9a1d42e7b 100644
--- a/data/presets/presets/amenity/swimming_pool.json
+++ b/data/presets/presets/amenity/swimming_pool.json
@@ -8,5 +8,6 @@
         "amenity": "swimming_pool"
     },
     "icon": "swimming",
-    "searchable": false
+    "searchable": false,
+    "name": "Swimming Pool"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/telephone.json b/data/presets/presets/amenity/telephone.json
index 6161db5c1..ddcbfc3df 100644
--- a/data/presets/presets/amenity/telephone.json
+++ b/data/presets/presets/amenity/telephone.json
@@ -5,5 +5,6 @@
     ],
     "tags": {
         "amenity": "telephone"
-    }
+    },
+    "name": "Telephone"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/theatre.json b/data/presets/presets/amenity/theatre.json
index 8420dc103..90669c2b5 100644
--- a/data/presets/presets/amenity/theatre.json
+++ b/data/presets/presets/amenity/theatre.json
@@ -11,11 +11,13 @@
         "area"
     ],
     "terms": [
+        "theatre",
         "performance",
         "play",
         "musical"
     ],
     "tags": {
         "amenity": "theatre"
-    }
+    },
+    "name": "Theater"
 }
diff --git a/data/presets/presets/amenity/toilets.json b/data/presets/presets/amenity/toilets.json
index b6a090d50..eee89e72e 100644
--- a/data/presets/presets/amenity/toilets.json
+++ b/data/presets/presets/amenity/toilets.json
@@ -11,5 +11,6 @@
     "terms": [],
     "tags": {
         "amenity": "toilets"
-    }
+    },
+    "name": "Toilets"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/townhall.json b/data/presets/presets/amenity/townhall.json
index 6349a1b03..df4594628 100644
--- a/data/presets/presets/amenity/townhall.json
+++ b/data/presets/presets/amenity/townhall.json
@@ -18,5 +18,6 @@
     ],
     "tags": {
         "amenity": "townhall"
-    }
+    },
+    "name": "Town Hall"
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/university.json b/data/presets/presets/amenity/university.json
index 649444f0b..56d098bbb 100644
--- a/data/presets/presets/amenity/university.json
+++ b/data/presets/presets/amenity/university.json
@@ -12,5 +12,6 @@
     "tags": {
         "amenity": "university"
     },
-    "terms": []
+    "terms": [],
+    "name": "University"
 }
\ No newline at end of file
diff --git a/data/presets/presets/building.json b/data/presets/presets/building.json
index cce49e1af..13b7c32dc 100644
--- a/data/presets/presets/building.json
+++ b/data/presets/presets/building.json
@@ -18,5 +18,6 @@
     "tags": {
         "building": "*"
     },
-    "terms": []
+    "terms": [],
+    "name": "Building"
 }
\ No newline at end of file
diff --git a/data/presets/presets/entrance.json b/data/presets/presets/entrance.json
index c2c53395d..d4f1d8f7e 100644
--- a/data/presets/presets/entrance.json
+++ b/data/presets/presets/entrance.json
@@ -7,5 +7,6 @@
     },
     "fields": [
         "entrance"
-    ]
+    ],
+    "name": "Entrance"
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway.json b/data/presets/presets/highway.json
index 7db81ada7..c70685b91 100644
--- a/data/presets/presets/highway.json
+++ b/data/presets/presets/highway.json
@@ -10,5 +10,6 @@
     ],
     "tags": {
         "highway": "*"
-    }
+    },
+    "name": "Highway"
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/bus_stop.json b/data/presets/presets/highway/bus_stop.json
index c414369a3..b881460d8 100644
--- a/data/presets/presets/highway/bus_stop.json
+++ b/data/presets/presets/highway/bus_stop.json
@@ -11,5 +11,6 @@
     "tags": {
         "highway": "bus_stop"
     },
-    "terms": []
+    "terms": [],
+    "name": "Bus Stop"
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/crossing.json b/data/presets/presets/highway/crossing.json
index 78753fbf8..8823df1cc 100644
--- a/data/presets/presets/highway/crossing.json
+++ b/data/presets/presets/highway/crossing.json
@@ -11,5 +11,6 @@
     "terms": [
         "crosswalk",
         "zebra crossing"
-    ]
+    ],
+    "name": "Crossing"
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/cycleway.json b/data/presets/presets/highway/cycleway.json
index 917be9ca7..29b315472 100644
--- a/data/presets/presets/highway/cycleway.json
+++ b/data/presets/presets/highway/cycleway.json
@@ -12,5 +12,6 @@
     "tags": {
         "highway": "cycleway"
     },
-    "terms": []
+    "terms": [],
+    "name": "Cycle Path"
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/footway.json b/data/presets/presets/highway/footway.json
index 0b6bc2b44..07e760faa 100644
--- a/data/presets/presets/highway/footway.json
+++ b/data/presets/presets/highway/footway.json
@@ -36,5 +36,6 @@
     ],
     "tags": {
         "highway": "footway"
-    }
-}
+    },
+    "name": "Foot Path"
+}
\ No newline at end of file
diff --git a/data/presets/presets/highway/motorway.json b/data/presets/presets/highway/motorway.json
index c7cb143bc..66db9b33d 100644
--- a/data/presets/presets/highway/motorway.json
+++ b/data/presets/presets/highway/motorway.json
@@ -13,5 +13,6 @@
     "tags": {
         "highway": "motorway"
     },
-    "terms": []
+    "terms": [],
+    "name": "Motorway"
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/path.json b/data/presets/presets/highway/path.json
index 69c9377e3..7b877201d 100644
--- a/data/presets/presets/highway/path.json
+++ b/data/presets/presets/highway/path.json
@@ -13,5 +13,6 @@
     "tags": {
         "highway": "path"
     },
-    "terms": []
+    "terms": [],
+    "name": "Path"
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/primary.json b/data/presets/presets/highway/primary.json
index aa771b708..09bb751c1 100644
--- a/data/presets/presets/highway/primary.json
+++ b/data/presets/presets/highway/primary.json
@@ -13,5 +13,6 @@
     "tags": {
         "highway": "primary"
     },
-    "terms": []
+    "terms": [],
+    "name": "Primary Road"
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/residential.json b/data/presets/presets/highway/residential.json
index 9434abe3d..72bf6334e 100644
--- a/data/presets/presets/highway/residential.json
+++ b/data/presets/presets/highway/residential.json
@@ -13,5 +13,6 @@
     "tags": {
         "highway": "residential"
     },
-    "terms": []
+    "terms": [],
+    "name": "Residential Road"
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/secondary.json b/data/presets/presets/highway/secondary.json
index bd6d65b70..44d3de1a3 100644
--- a/data/presets/presets/highway/secondary.json
+++ b/data/presets/presets/highway/secondary.json
@@ -13,5 +13,6 @@
     "tags": {
         "highway": "secondary"
     },
-    "terms": []
+    "terms": [],
+    "name": "Secondary Road"
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/service.json b/data/presets/presets/highway/service.json
index 7d349d27d..9be64c150 100644
--- a/data/presets/presets/highway/service.json
+++ b/data/presets/presets/highway/service.json
@@ -14,5 +14,6 @@
     "tags": {
         "highway": "service"
     },
-    "terms": []
+    "terms": [],
+    "name": "Service Road"
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/steps.json b/data/presets/presets/highway/steps.json
index 09bc5a709..27db92393 100644
--- a/data/presets/presets/highway/steps.json
+++ b/data/presets/presets/highway/steps.json
@@ -12,5 +12,6 @@
     "terms": [
         "stairs",
         "staircase"
-    ]
+    ],
+    "name": "Steps"
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/tertiary.json b/data/presets/presets/highway/tertiary.json
index b37e1c4fd..832d295d7 100644
--- a/data/presets/presets/highway/tertiary.json
+++ b/data/presets/presets/highway/tertiary.json
@@ -13,5 +13,6 @@
     "tags": {
         "highway": "tertiary"
     },
-    "terms": []
+    "terms": [],
+    "name": "Tertiary Road"
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/track.json b/data/presets/presets/highway/track.json
index f3c9b26bf..c78f67539 100644
--- a/data/presets/presets/highway/track.json
+++ b/data/presets/presets/highway/track.json
@@ -13,5 +13,6 @@
     "tags": {
         "highway": "track"
     },
-    "terms": []
+    "terms": [],
+    "name": "Track"
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/traffic_signals.json b/data/presets/presets/highway/traffic_signals.json
index 73da24429..62e5d60e8 100644
--- a/data/presets/presets/highway/traffic_signals.json
+++ b/data/presets/presets/highway/traffic_signals.json
@@ -9,5 +9,6 @@
         "light",
         "stoplight",
         "traffic light"
-    ]
+    ],
+    "name": "Traffic Signals"
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/trunk.json b/data/presets/presets/highway/trunk.json
index 0d9ecdd85..62aa1f0f3 100644
--- a/data/presets/presets/highway/trunk.json
+++ b/data/presets/presets/highway/trunk.json
@@ -13,5 +13,6 @@
     "tags": {
         "highway": "trunk"
     },
-    "terms": []
+    "terms": [],
+    "name": "Trunk Road"
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/turning_circle.json b/data/presets/presets/highway/turning_circle.json
index 52b7b13c3..18901a1a3 100644
--- a/data/presets/presets/highway/turning_circle.json
+++ b/data/presets/presets/highway/turning_circle.json
@@ -6,5 +6,6 @@
     "tags": {
         "highway": "turning_circle"
     },
-    "terms": []
+    "terms": [],
+    "name": "Turning Circle"
 }
\ No newline at end of file
diff --git a/data/presets/presets/highway/unclassified.json b/data/presets/presets/highway/unclassified.json
index 4572fd853..f6491fcd2 100644
--- a/data/presets/presets/highway/unclassified.json
+++ b/data/presets/presets/highway/unclassified.json
@@ -13,5 +13,6 @@
     "tags": {
         "highway": "unclassified"
     },
-    "terms": []
+    "terms": [],
+    "name": "Unclassified Road"
 }
\ No newline at end of file
diff --git a/data/presets/presets/historic.json b/data/presets/presets/historic.json
index 9bd214d73..0fb90ed45 100644
--- a/data/presets/presets/historic.json
+++ b/data/presets/presets/historic.json
@@ -9,5 +9,6 @@
     ],
     "tags": {
         "historic": "*"
-    }
+    },
+    "name": "Historic Site"
 }
\ No newline at end of file
diff --git a/data/presets/presets/historic/monument.json b/data/presets/presets/historic/monument.json
index c6067b497..fb9404a46 100644
--- a/data/presets/presets/historic/monument.json
+++ b/data/presets/presets/historic/monument.json
@@ -7,5 +7,6 @@
     ],
     "tags": {
         "historic": "monument"
-    }
+    },
+    "name": "Monument"
 }
\ No newline at end of file
diff --git a/data/presets/presets/landuse.json b/data/presets/presets/landuse.json
index 6b6f1e89b..cabf98139 100644
--- a/data/presets/presets/landuse.json
+++ b/data/presets/presets/landuse.json
@@ -9,5 +9,6 @@
     ],
     "tags": {
         "landuse": "*"
-    }
+    },
+    "name": "Landuse"
 }
\ No newline at end of file
diff --git a/data/presets/presets/landuse/allotments.json b/data/presets/presets/landuse/allotments.json
index ff030dcbe..51e6768db 100644
--- a/data/presets/presets/landuse/allotments.json
+++ b/data/presets/presets/landuse/allotments.json
@@ -6,5 +6,6 @@
     "tags": {
         "landuse": "allotments"
     },
-    "terms": []
+    "terms": [],
+    "name": "Allotments"
 }
\ No newline at end of file
diff --git a/data/presets/presets/landuse/basin.json b/data/presets/presets/landuse/basin.json
index 27fdeff9d..a7602808f 100644
--- a/data/presets/presets/landuse/basin.json
+++ b/data/presets/presets/landuse/basin.json
@@ -6,5 +6,6 @@
     "tags": {
         "landuse": "basin"
     },
-    "terms": []
+    "terms": [],
+    "name": "Basin"
 }
\ No newline at end of file
diff --git a/data/presets/presets/landuse/cemetery.json b/data/presets/presets/landuse/cemetery.json
index ffacde93b..dd5940276 100644
--- a/data/presets/presets/landuse/cemetery.json
+++ b/data/presets/presets/landuse/cemetery.json
@@ -7,5 +7,6 @@
     "tags": {
         "landuse": "cemetery"
     },
-    "terms": []
+    "terms": [],
+    "name": "Cemetery"
 }
\ No newline at end of file
diff --git a/data/presets/presets/landuse/commercial.json b/data/presets/presets/landuse/commercial.json
index e9845081e..a51d4628e 100644
--- a/data/presets/presets/landuse/commercial.json
+++ b/data/presets/presets/landuse/commercial.json
@@ -6,5 +6,6 @@
     "tags": {
         "landuse": "commercial"
     },
-    "terms": []
+    "terms": [],
+    "name": "Commercial"
 }
\ No newline at end of file
diff --git a/data/presets/presets/landuse/construction.json b/data/presets/presets/landuse/construction.json
index 11e8b8d87..b1cfbaac6 100644
--- a/data/presets/presets/landuse/construction.json
+++ b/data/presets/presets/landuse/construction.json
@@ -10,5 +10,6 @@
     "tags": {
         "landuse": "construction"
     },
-    "terms": []
+    "terms": [],
+    "name": "Construction"
 }
\ No newline at end of file
diff --git a/data/presets/presets/landuse/farm.json b/data/presets/presets/landuse/farm.json
index 42ddf9c9f..8d73f1146 100644
--- a/data/presets/presets/landuse/farm.json
+++ b/data/presets/presets/landuse/farm.json
@@ -6,5 +6,6 @@
     "tags": {
         "landuse": "farm"
     },
-    "terms": []
+    "terms": [],
+    "name": "Farm"
 }
\ No newline at end of file
diff --git a/data/presets/presets/landuse/farmyard.json b/data/presets/presets/landuse/farmyard.json
index d48455b23..b49dc658c 100644
--- a/data/presets/presets/landuse/farmyard.json
+++ b/data/presets/presets/landuse/farmyard.json
@@ -6,5 +6,6 @@
     "tags": {
         "landuse": "farmyard"
     },
-    "terms": []
+    "terms": [],
+    "name": "Farmyard"
 }
\ No newline at end of file
diff --git a/data/presets/presets/landuse/forest.json b/data/presets/presets/landuse/forest.json
index 261afc5a0..8c6af66e1 100644
--- a/data/presets/presets/landuse/forest.json
+++ b/data/presets/presets/landuse/forest.json
@@ -10,5 +10,6 @@
     "tags": {
         "landuse": "forest"
     },
-    "terms": []
+    "terms": [],
+    "name": "Forest"
 }
\ No newline at end of file
diff --git a/data/presets/presets/landuse/grass.json b/data/presets/presets/landuse/grass.json
index 37b7fb111..35d46fbb2 100644
--- a/data/presets/presets/landuse/grass.json
+++ b/data/presets/presets/landuse/grass.json
@@ -6,5 +6,6 @@
     "tags": {
         "landuse": "grass"
     },
-    "terms": []
+    "terms": [],
+    "name": "Grass"
 }
\ No newline at end of file
diff --git a/data/presets/presets/landuse/industrial.json b/data/presets/presets/landuse/industrial.json
index f94b55b40..7ef73dd7b 100644
--- a/data/presets/presets/landuse/industrial.json
+++ b/data/presets/presets/landuse/industrial.json
@@ -6,5 +6,6 @@
     "tags": {
         "landuse": "industrial"
     },
-    "terms": []
+    "terms": [],
+    "name": "Industrial"
 }
\ No newline at end of file
diff --git a/data/presets/presets/landuse/meadow.json b/data/presets/presets/landuse/meadow.json
index 9cedc4b2a..eba4bfec1 100644
--- a/data/presets/presets/landuse/meadow.json
+++ b/data/presets/presets/landuse/meadow.json
@@ -6,5 +6,6 @@
     "tags": {
         "landuse": "meadow"
     },
-    "terms": []
+    "terms": [],
+    "name": "Meadow"
 }
\ No newline at end of file
diff --git a/data/presets/presets/landuse/orchard.json b/data/presets/presets/landuse/orchard.json
index 25cd7b057..a892387df 100644
--- a/data/presets/presets/landuse/orchard.json
+++ b/data/presets/presets/landuse/orchard.json
@@ -6,5 +6,6 @@
     "tags": {
         "landuse": "orchard"
     },
-    "terms": []
+    "terms": [],
+    "name": "Orchard"
 }
\ No newline at end of file
diff --git a/data/presets/presets/landuse/quarry.json b/data/presets/presets/landuse/quarry.json
index 2c43c519f..aee2bc306 100644
--- a/data/presets/presets/landuse/quarry.json
+++ b/data/presets/presets/landuse/quarry.json
@@ -6,5 +6,6 @@
     "tags": {
         "landuse": "quarry"
     },
-    "terms": []
+    "terms": [],
+    "name": "Quarry"
 }
\ No newline at end of file
diff --git a/data/presets/presets/landuse/residential.json b/data/presets/presets/landuse/residential.json
index aa2f1d22d..e4199c240 100644
--- a/data/presets/presets/landuse/residential.json
+++ b/data/presets/presets/landuse/residential.json
@@ -6,5 +6,6 @@
     "tags": {
         "landuse": "residential"
     },
-    "terms": []
+    "terms": [],
+    "name": "Residential"
 }
\ No newline at end of file
diff --git a/data/presets/presets/landuse/vineyard.json b/data/presets/presets/landuse/vineyard.json
index 48063f768..08f813bca 100644
--- a/data/presets/presets/landuse/vineyard.json
+++ b/data/presets/presets/landuse/vineyard.json
@@ -6,5 +6,6 @@
     "tags": {
         "landuse": "vineyard"
     },
-    "terms": []
+    "terms": [],
+    "name": "Vineyard"
 }
\ No newline at end of file
diff --git a/data/presets/presets/leisure.json b/data/presets/presets/leisure.json
index 5b0be53de..32c695dd7 100644
--- a/data/presets/presets/leisure.json
+++ b/data/presets/presets/leisure.json
@@ -9,5 +9,6 @@
     ],
     "tags": {
         "leisure": "*"
-    }
+    },
+    "name": "Leisure"
 }
\ No newline at end of file
diff --git a/data/presets/presets/leisure/garden.json b/data/presets/presets/leisure/garden.json
index ebd8cee10..5cd9f7377 100644
--- a/data/presets/presets/leisure/garden.json
+++ b/data/presets/presets/leisure/garden.json
@@ -7,5 +7,6 @@
     ],
     "tags": {
         "leisure": "garden"
-    }
+    },
+    "name": "Garden"
 }
\ No newline at end of file
diff --git a/data/presets/presets/leisure/golf_course.json b/data/presets/presets/leisure/golf_course.json
index 3f7aa687f..1be1e6904 100644
--- a/data/presets/presets/leisure/golf_course.json
+++ b/data/presets/presets/leisure/golf_course.json
@@ -11,5 +11,6 @@
     "tags": {
         "leisure": "golf_course"
     },
-    "terms": []
+    "terms": [],
+    "name": "Golf Course"
 }
\ No newline at end of file
diff --git a/data/presets/presets/leisure/park.json b/data/presets/presets/leisure/park.json
index e2e79a693..15e40b52c 100644
--- a/data/presets/presets/leisure/park.json
+++ b/data/presets/presets/leisure/park.json
@@ -28,5 +28,6 @@
     ],
     "tags": {
         "leisure": "park"
-    }
+    },
+    "name": "Park"
 }
\ No newline at end of file
diff --git a/data/presets/presets/leisure/pitch.json b/data/presets/presets/leisure/pitch.json
index 120e8b0e2..ff0fff291 100644
--- a/data/presets/presets/leisure/pitch.json
+++ b/data/presets/presets/leisure/pitch.json
@@ -11,5 +11,6 @@
     "tags": {
         "leisure": "pitch"
     },
-    "terms": []
+    "terms": [],
+    "name": "Sport Pitch"
 }
\ No newline at end of file
diff --git a/data/presets/presets/leisure/pitch/american_football.json b/data/presets/presets/leisure/pitch/american_football.json
index 615caf119..a01fdd3e0 100644
--- a/data/presets/presets/leisure/pitch/american_football.json
+++ b/data/presets/presets/leisure/pitch/american_football.json
@@ -11,5 +11,6 @@
         "leisure": "pitch",
         "sport": "american_football"
     },
-    "terms": []
+    "terms": [],
+    "name": "American Football Field"
 }
\ No newline at end of file
diff --git a/data/presets/presets/leisure/pitch/baseball.json b/data/presets/presets/leisure/pitch/baseball.json
index 8ebc1b3fe..ad318a6c9 100644
--- a/data/presets/presets/leisure/pitch/baseball.json
+++ b/data/presets/presets/leisure/pitch/baseball.json
@@ -8,5 +8,6 @@
         "leisure": "pitch",
         "sport": "baseball"
     },
-    "terms": []
+    "terms": [],
+    "name": "Baseball Diamond"
 }
\ No newline at end of file
diff --git a/data/presets/presets/leisure/pitch/basketball.json b/data/presets/presets/leisure/pitch/basketball.json
index 7b91b4639..a0a25e838 100644
--- a/data/presets/presets/leisure/pitch/basketball.json
+++ b/data/presets/presets/leisure/pitch/basketball.json
@@ -11,5 +11,6 @@
         "leisure": "pitch",
         "sport": "basketball"
     },
-    "terms": []
+    "terms": [],
+    "name": "Basketball Court"
 }
\ No newline at end of file
diff --git a/data/presets/presets/leisure/pitch/soccer.json b/data/presets/presets/leisure/pitch/soccer.json
index 58507f89a..4f1724ea0 100644
--- a/data/presets/presets/leisure/pitch/soccer.json
+++ b/data/presets/presets/leisure/pitch/soccer.json
@@ -11,5 +11,6 @@
         "leisure": "pitch",
         "sport": "soccer"
     },
-    "terms": []
+    "terms": [],
+    "name": "Soccer Field"
 }
\ No newline at end of file
diff --git a/data/presets/presets/leisure/pitch/tennis.json b/data/presets/presets/leisure/pitch/tennis.json
index 686948cae..6a308bcfb 100644
--- a/data/presets/presets/leisure/pitch/tennis.json
+++ b/data/presets/presets/leisure/pitch/tennis.json
@@ -11,5 +11,6 @@
         "leisure": "pitch",
         "sport": "tennis"
     },
-    "terms": []
+    "terms": [],
+    "name": "Tennis Court"
 }
\ No newline at end of file
diff --git a/data/presets/presets/leisure/playground.json b/data/presets/presets/leisure/playground.json
index 2ed8db665..bb48845a7 100644
--- a/data/presets/presets/leisure/playground.json
+++ b/data/presets/presets/leisure/playground.json
@@ -5,5 +5,6 @@
     ],
     "tags": {
         "leisure": "playground"
-    }
+    },
+    "name": "Playground"
 }
\ No newline at end of file
diff --git a/data/presets/presets/leisure/stadium.json b/data/presets/presets/leisure/stadium.json
index dac748444..cb3a1de3f 100644
--- a/data/presets/presets/leisure/stadium.json
+++ b/data/presets/presets/leisure/stadium.json
@@ -8,5 +8,6 @@
     },
     "fields": [
         "sport"
-    ]
+    ],
+    "name": "Stadium"
 }
diff --git a/data/presets/presets/leisure/swimming_pool.json b/data/presets/presets/leisure/swimming_pool.json
index 47f2ca841..134d23d11 100644
--- a/data/presets/presets/leisure/swimming_pool.json
+++ b/data/presets/presets/leisure/swimming_pool.json
@@ -7,5 +7,6 @@
     "tags": {
         "leisure": "swimming_pool"
     },
-    "icon": "swimming"
+    "icon": "swimming",
+    "name": "Swimming Pool"
 }
\ No newline at end of file
diff --git a/data/presets/presets/man_made.json b/data/presets/presets/man_made.json
index caca6436d..c861d3155 100644
--- a/data/presets/presets/man_made.json
+++ b/data/presets/presets/man_made.json
@@ -10,5 +10,6 @@
     ],
     "tags": {
         "man_made": "*"
-    }
+    },
+    "name": "Man Made"
 }
\ No newline at end of file
diff --git a/data/presets/presets/man_made/lighthouse.json b/data/presets/presets/man_made/lighthouse.json
index a6105d210..2abea4a83 100644
--- a/data/presets/presets/man_made/lighthouse.json
+++ b/data/presets/presets/man_made/lighthouse.json
@@ -5,5 +5,6 @@
     ],
     "tags": {
         "man_made": "lighthouse"
-    }
+    },
+    "name": "Lighthouse"
 }
\ No newline at end of file
diff --git a/data/presets/presets/man_made/pier.json b/data/presets/presets/man_made/pier.json
index d8082d48e..ae436dcd4 100644
--- a/data/presets/presets/man_made/pier.json
+++ b/data/presets/presets/man_made/pier.json
@@ -5,5 +5,6 @@
     ],
     "tags": {
         "man_made": "pier"
-    }
+    },
+    "name": "Pier"
 }
\ No newline at end of file
diff --git a/data/presets/presets/man_made/survey_point.json b/data/presets/presets/man_made/survey_point.json
index 99024cea2..cbf197341 100644
--- a/data/presets/presets/man_made/survey_point.json
+++ b/data/presets/presets/man_made/survey_point.json
@@ -9,5 +9,6 @@
     },
     "fields": [
         "ref"
-    ]
+    ],
+    "name": "Survey Point"
 }
\ No newline at end of file
diff --git a/data/presets/presets/man_made/water_tower.json b/data/presets/presets/man_made/water_tower.json
index 16405739a..fbfc258c7 100644
--- a/data/presets/presets/man_made/water_tower.json
+++ b/data/presets/presets/man_made/water_tower.json
@@ -6,5 +6,6 @@
     ],
     "tags": {
         "man_made": "water_tower"
-    }
+    },
+    "name": "Water Tower"
 }
\ No newline at end of file
diff --git a/data/presets/presets/natural.json b/data/presets/presets/natural.json
index 98cfbc0c6..f6d4d69f5 100644
--- a/data/presets/presets/natural.json
+++ b/data/presets/presets/natural.json
@@ -9,5 +9,6 @@
     ],
     "tags": {
         "natural": "*"
-    }
+    },
+    "name": "Natural"
 }
\ No newline at end of file
diff --git a/data/presets/presets/natural/bay.json b/data/presets/presets/natural/bay.json
index 9c83715c7..48fbc04e9 100644
--- a/data/presets/presets/natural/bay.json
+++ b/data/presets/presets/natural/bay.json
@@ -6,5 +6,6 @@
     "terms": [],
     "tags": {
         "natural": "bay"
-    }
+    },
+    "name": "Bay"
 }
\ No newline at end of file
diff --git a/data/presets/presets/natural/beach.json b/data/presets/presets/natural/beach.json
index e7379a9c0..8e32bc4a0 100644
--- a/data/presets/presets/natural/beach.json
+++ b/data/presets/presets/natural/beach.json
@@ -9,5 +9,6 @@
     "terms": [],
     "tags": {
         "natural": "beach"
-    }
+    },
+    "name": "Beach"
 }
\ No newline at end of file
diff --git a/data/presets/presets/natural/cliff.json b/data/presets/presets/natural/cliff.json
index b2b5ce86a..a29e609d4 100644
--- a/data/presets/presets/natural/cliff.json
+++ b/data/presets/presets/natural/cliff.json
@@ -8,5 +8,6 @@
     "terms": [],
     "tags": {
         "natural": "cliff"
-    }
+    },
+    "name": "Cliff"
 }
\ No newline at end of file
diff --git a/data/presets/presets/natural/coastline.json b/data/presets/presets/natural/coastline.json
index c82ef86ec..fd601a56f 100644
--- a/data/presets/presets/natural/coastline.json
+++ b/data/presets/presets/natural/coastline.json
@@ -7,5 +7,6 @@
     ],
     "tags": {
         "natural": "coastline"
-    }
+    },
+    "name": "Coastline"
 }
\ No newline at end of file
diff --git a/data/presets/presets/natural/glacier.json b/data/presets/presets/natural/glacier.json
index fefb10447..dd40909bd 100644
--- a/data/presets/presets/natural/glacier.json
+++ b/data/presets/presets/natural/glacier.json
@@ -5,5 +5,6 @@
     "terms": [],
     "tags": {
         "natural": "glacier"
-    }
+    },
+    "name": "Glacier"
 }
\ No newline at end of file
diff --git a/data/presets/presets/natural/grassland.json b/data/presets/presets/natural/grassland.json
index aa05a362e..84e7cbf58 100644
--- a/data/presets/presets/natural/grassland.json
+++ b/data/presets/presets/natural/grassland.json
@@ -6,5 +6,6 @@
     "terms": [],
     "tags": {
         "natural": "grassland"
-    }
+    },
+    "name": "Grassland"
 }
\ No newline at end of file
diff --git a/data/presets/presets/natural/heath.json b/data/presets/presets/natural/heath.json
index 6da869aa8..bf2fdc0f9 100644
--- a/data/presets/presets/natural/heath.json
+++ b/data/presets/presets/natural/heath.json
@@ -5,5 +5,6 @@
     "terms": [],
     "tags": {
         "natural": "heath"
-    }
+    },
+    "name": "Heath"
 }
\ No newline at end of file
diff --git a/data/presets/presets/natural/peak.json b/data/presets/presets/natural/peak.json
index 145f10df9..718a68c21 100644
--- a/data/presets/presets/natural/peak.json
+++ b/data/presets/presets/natural/peak.json
@@ -24,5 +24,6 @@
         "summit",
         "tip",
         "top"
-    ]
+    ],
+    "name": "Peak"
 }
\ No newline at end of file
diff --git a/data/presets/presets/natural/scrub.json b/data/presets/presets/natural/scrub.json
index 1fa7fca46..efa36bc57 100644
--- a/data/presets/presets/natural/scrub.json
+++ b/data/presets/presets/natural/scrub.json
@@ -5,5 +5,6 @@
     "tags": {
         "natural": "scrub"
     },
-    "terms": []
+    "terms": [],
+    "name": "Scrub"
 }
\ No newline at end of file
diff --git a/data/presets/presets/natural/spring.json b/data/presets/presets/natural/spring.json
index 07a2411d5..0d6b2a93f 100644
--- a/data/presets/presets/natural/spring.json
+++ b/data/presets/presets/natural/spring.json
@@ -6,5 +6,6 @@
     "terms": [],
     "tags": {
         "natural": "spring"
-    }
+    },
+    "name": "Spring"
 }
\ No newline at end of file
diff --git a/data/presets/presets/natural/tree.json b/data/presets/presets/natural/tree.json
index 6353354bd..e54a49c4b 100644
--- a/data/presets/presets/natural/tree.json
+++ b/data/presets/presets/natural/tree.json
@@ -10,5 +10,6 @@
     "terms": [],
     "tags": {
         "natural": "tree"
-    }
+    },
+    "name": "Tree"
 }
\ No newline at end of file
diff --git a/data/presets/presets/natural/water.json b/data/presets/presets/natural/water.json
index 193326192..7de80e9a7 100644
--- a/data/presets/presets/natural/water.json
+++ b/data/presets/presets/natural/water.json
@@ -8,5 +8,6 @@
     "tags": {
         "natural": "water"
     },
-    "icon": "water"
+    "icon": "water",
+    "name": "Water"
 }
\ No newline at end of file
diff --git a/data/presets/presets/natural/water/lake.json b/data/presets/presets/natural/water/lake.json
index 55c5b8c7b..f6bfcff15 100644
--- a/data/presets/presets/natural/water/lake.json
+++ b/data/presets/presets/natural/water/lake.json
@@ -11,5 +11,6 @@
         "loch",
         "mere"
     ],
-    "icon": "water"
+    "icon": "water",
+    "name": "Lake"
 }
\ No newline at end of file
diff --git a/data/presets/presets/natural/water/pond.json b/data/presets/presets/natural/water/pond.json
index 2859b84c9..b4d92500d 100644
--- a/data/presets/presets/natural/water/pond.json
+++ b/data/presets/presets/natural/water/pond.json
@@ -13,5 +13,6 @@
         "pool",
         "mere"
     ],
-    "icon": "water"
+    "icon": "water",
+    "name": "Pond"
 }
\ No newline at end of file
diff --git a/data/presets/presets/natural/water/reservoir.json b/data/presets/presets/natural/water/reservoir.json
index 11fa515db..bdd709011 100644
--- a/data/presets/presets/natural/water/reservoir.json
+++ b/data/presets/presets/natural/water/reservoir.json
@@ -6,5 +6,6 @@
         "natural": "water",
         "water": "reservoir"
     },
-    "icon": "water"
+    "icon": "water",
+    "name": "Reservoir"
 }
\ No newline at end of file
diff --git a/data/presets/presets/natural/wetland.json b/data/presets/presets/natural/wetland.json
index f08598189..86ab0acee 100644
--- a/data/presets/presets/natural/wetland.json
+++ b/data/presets/presets/natural/wetland.json
@@ -10,5 +10,6 @@
     "tags": {
         "natural": "wetland"
     },
-    "terms": []
-}
+    "terms": [],
+    "name": "Wetland"
+}
\ No newline at end of file
diff --git a/data/presets/presets/natural/wood.json b/data/presets/presets/natural/wood.json
index 9a1ff9c27..e4afa1ad8 100644
--- a/data/presets/presets/natural/wood.json
+++ b/data/presets/presets/natural/wood.json
@@ -10,5 +10,6 @@
     "tags": {
         "natural": "wood"
     },
-    "terms": []
+    "terms": [],
+    "name": "Wood"
 }
\ No newline at end of file
diff --git a/data/presets/presets/office.json b/data/presets/presets/office.json
index a79f1cdc8..e077ef635 100644
--- a/data/presets/presets/office.json
+++ b/data/presets/presets/office.json
@@ -13,5 +13,6 @@
     "tags": {
         "office": "*"
     },
-    "terms": []
+    "terms": [],
+    "name": "Office"
 }
\ No newline at end of file
diff --git a/data/presets/presets/place.json b/data/presets/presets/place.json
index 09434c082..4ce86b570 100644
--- a/data/presets/presets/place.json
+++ b/data/presets/presets/place.json
@@ -9,5 +9,6 @@
     ],
     "tags": {
         "place": "*"
-    }
+    },
+    "name": "Place"
 }
\ No newline at end of file
diff --git a/data/presets/presets/place/hamlet.json b/data/presets/presets/place/hamlet.json
index f67c2f9a1..ee1090551 100644
--- a/data/presets/presets/place/hamlet.json
+++ b/data/presets/presets/place/hamlet.json
@@ -6,5 +6,6 @@
     ],
     "tags": {
         "place": "hamlet"
-    }
+    },
+    "name": "Hamlet"
 }
\ No newline at end of file
diff --git a/data/presets/presets/place/island.json b/data/presets/presets/place/island.json
index 113f96353..fd847e745 100644
--- a/data/presets/presets/place/island.json
+++ b/data/presets/presets/place/island.json
@@ -15,5 +15,6 @@
     ],
     "tags": {
         "place": "island"
-    }
+    },
+    "name": "Island"
 }
\ No newline at end of file
diff --git a/data/presets/presets/place/locality.json b/data/presets/presets/place/locality.json
index e2f5d6979..e958a552d 100644
--- a/data/presets/presets/place/locality.json
+++ b/data/presets/presets/place/locality.json
@@ -6,5 +6,6 @@
     ],
     "tags": {
         "place": "locality"
-    }
+    },
+    "name": "Locality"
 }
\ No newline at end of file
diff --git a/data/presets/presets/place/village.json b/data/presets/presets/place/village.json
index 0f41a1922..4a87d4f46 100644
--- a/data/presets/presets/place/village.json
+++ b/data/presets/presets/place/village.json
@@ -6,5 +6,6 @@
     ],
     "tags": {
         "place": "village"
-    }
+    },
+    "name": "Village"
 }
\ No newline at end of file
diff --git a/data/presets/presets/power/sub_station.json b/data/presets/presets/power/sub_station.json
index e706193b8..313a0a186 100644
--- a/data/presets/presets/power/sub_station.json
+++ b/data/presets/presets/power/sub_station.json
@@ -8,5 +8,6 @@
     ],
     "tags": {
         "power": "substation"
-    }
+    },
+    "name": "Substation"
 }
\ No newline at end of file
diff --git a/data/presets/presets/railway.json b/data/presets/presets/railway.json
index cc42d7541..b1b42ee8a 100644
--- a/data/presets/presets/railway.json
+++ b/data/presets/presets/railway.json
@@ -10,5 +10,6 @@
     ],
     "tags": {
         "railway": "*"
-    }
+    },
+    "name": "Railway"
 }
\ No newline at end of file
diff --git a/data/presets/presets/railway/level_crossing.json b/data/presets/presets/railway/level_crossing.json
index 301fc9c80..983cb2efe 100644
--- a/data/presets/presets/railway/level_crossing.json
+++ b/data/presets/presets/railway/level_crossing.json
@@ -13,5 +13,6 @@
         "grade crossing",
         "road through railroad",
         "train crossing"
-    ]
+    ],
+    "name": "Level Crossing"
 }
\ No newline at end of file
diff --git a/data/presets/presets/railway/rail.json b/data/presets/presets/railway/rail.json
index 4dac78f72..23249045e 100644
--- a/data/presets/presets/railway/rail.json
+++ b/data/presets/presets/railway/rail.json
@@ -9,5 +9,6 @@
     "fields": [
         "structure"
     ],
-    "terms": []
-}
+    "terms": [],
+    "name": "Rail"
+}
\ No newline at end of file
diff --git a/data/presets/presets/railway/subway.json b/data/presets/presets/railway/subway.json
index 5dc0aefb9..a098786e9 100644
--- a/data/presets/presets/railway/subway.json
+++ b/data/presets/presets/railway/subway.json
@@ -9,5 +9,6 @@
     "tags": {
         "railway": "subway"
     },
-    "terms": []
-}
+    "terms": [],
+    "name": "Subway"
+}
\ No newline at end of file
diff --git a/data/presets/presets/railway/subway_entrance.json b/data/presets/presets/railway/subway_entrance.json
index 5091a2aed..0d8897d25 100644
--- a/data/presets/presets/railway/subway_entrance.json
+++ b/data/presets/presets/railway/subway_entrance.json
@@ -6,5 +6,6 @@
     "tags": {
         "railway": "subway_entrance"
     },
-    "terms": []
+    "terms": [],
+    "name": "Subway Entrance"
 }
\ No newline at end of file
diff --git a/data/presets/presets/shop.json b/data/presets/presets/shop.json
index 7d5562491..fc046a20b 100644
--- a/data/presets/presets/shop.json
+++ b/data/presets/presets/shop.json
@@ -13,5 +13,6 @@
     "tags": {
         "shop": "*"
     },
-    "terms": []
+    "terms": [],
+    "name": "Shop"
 }
\ No newline at end of file
diff --git a/data/presets/presets/shop/butcher.json b/data/presets/presets/shop/butcher.json
index 388f99cbd..ea00b022f 100644
--- a/data/presets/presets/shop/butcher.json
+++ b/data/presets/presets/shop/butcher.json
@@ -12,5 +12,6 @@
     "terms": [],
     "tags": {
         "shop": "butcher"
-    }
+    },
+    "name": "Butcher"
 }
\ No newline at end of file
diff --git a/data/presets/presets/shop/supermarket.json b/data/presets/presets/shop/supermarket.json
index 4e606a8c6..40d44575e 100644
--- a/data/presets/presets/shop/supermarket.json
+++ b/data/presets/presets/shop/supermarket.json
@@ -34,5 +34,6 @@
     ],
     "tags": {
         "shop": "supermarket"
-    }
+    },
+    "name": "Supermarket"
 }
\ No newline at end of file
diff --git a/data/presets/presets/tourism.json b/data/presets/presets/tourism.json
index 1633b3dda..88534c627 100644
--- a/data/presets/presets/tourism.json
+++ b/data/presets/presets/tourism.json
@@ -9,5 +9,6 @@
     ],
     "tags": {
         "tourism": "*"
-    }
+    },
+    "name": "Tourism"
 }
\ No newline at end of file
diff --git a/data/presets/presets/tourism/alpine_hut.json b/data/presets/presets/tourism/alpine_hut.json
index 1ec5c1a26..0b4452d89 100644
--- a/data/presets/presets/tourism/alpine_hut.json
+++ b/data/presets/presets/tourism/alpine_hut.json
@@ -11,5 +11,6 @@
     ],
     "tags": {
         "tourism": "alpine_hut"
-    }
+    },
+    "name": "Alpine Hut"
 }
\ No newline at end of file
diff --git a/data/presets/presets/tourism/artwork.json b/data/presets/presets/tourism/artwork.json
index d89a86f43..5f39a5331 100644
--- a/data/presets/presets/tourism/artwork.json
+++ b/data/presets/presets/tourism/artwork.json
@@ -7,5 +7,6 @@
     ],
     "tags": {
         "tourism": "artwork"
-    }
+    },
+    "name": "Artwork"
 }
\ No newline at end of file
diff --git a/data/presets/presets/tourism/attraction.json b/data/presets/presets/tourism/attraction.json
index a8a6a2c9d..8ff80ab09 100644
--- a/data/presets/presets/tourism/attraction.json
+++ b/data/presets/presets/tourism/attraction.json
@@ -10,5 +10,6 @@
     ],
     "tags": {
         "tourism": "attraction"
-    }
+    },
+    "name": "Tourist Attraction"
 }
\ No newline at end of file
diff --git a/data/presets/presets/tourism/camp_site.json b/data/presets/presets/tourism/camp_site.json
index 6a6d6fb00..55be62d56 100644
--- a/data/presets/presets/tourism/camp_site.json
+++ b/data/presets/presets/tourism/camp_site.json
@@ -12,5 +12,6 @@
     "terms": [],
     "tags": {
         "tourism": "camp_site"
-    }
+    },
+    "name": "Camp Site"
 }
\ No newline at end of file
diff --git a/data/presets/presets/tourism/caravan_site.json b/data/presets/presets/tourism/caravan_site.json
index 3aaea713f..8cca34bd1 100644
--- a/data/presets/presets/tourism/caravan_site.json
+++ b/data/presets/presets/tourism/caravan_site.json
@@ -10,5 +10,6 @@
     ],
     "tags": {
         "tourism": "caravan_site"
-    }
+    },
+    "name": "RV Park"
 }
\ No newline at end of file
diff --git a/data/presets/presets/tourism/chalet.json b/data/presets/presets/tourism/chalet.json
index 4c4b97bfb..9dd19d86a 100644
--- a/data/presets/presets/tourism/chalet.json
+++ b/data/presets/presets/tourism/chalet.json
@@ -12,5 +12,6 @@
     ],
     "tags": {
         "tourism": "chalet"
-    }
+    },
+    "name": "Chalet"
 }
\ No newline at end of file
diff --git a/data/presets/presets/tourism/guest_house.json b/data/presets/presets/tourism/guest_house.json
index 7228e8778..1bf1cf6b6 100644
--- a/data/presets/presets/tourism/guest_house.json
+++ b/data/presets/presets/tourism/guest_house.json
@@ -16,5 +16,6 @@
         "B&B",
         "Bed & Breakfast",
         "Bed and Breakfast"
-    ]
+    ],
+    "name": "Guest House"
 }
\ No newline at end of file
diff --git a/data/presets/presets/tourism/hostel.json b/data/presets/presets/tourism/hostel.json
index 7fcd46399..1f817a840 100644
--- a/data/presets/presets/tourism/hostel.json
+++ b/data/presets/presets/tourism/hostel.json
@@ -12,5 +12,6 @@
     ],
     "tags": {
         "tourism": "hostel"
-    }
+    },
+    "name": "Hostel"
 }
\ No newline at end of file
diff --git a/data/presets/presets/tourism/hotel.json b/data/presets/presets/tourism/hotel.json
index 3790eb437..5ba36bdd6 100644
--- a/data/presets/presets/tourism/hotel.json
+++ b/data/presets/presets/tourism/hotel.json
@@ -13,5 +13,6 @@
     "terms": [],
     "tags": {
         "tourism": "hotel"
-    }
+    },
+    "name": "Hotel"
 }
\ No newline at end of file
diff --git a/data/presets/presets/tourism/information.json b/data/presets/presets/tourism/information.json
index c178bfaef..3b7ec2738 100644
--- a/data/presets/presets/tourism/information.json
+++ b/data/presets/presets/tourism/information.json
@@ -10,5 +10,6 @@
     ],
     "tags": {
         "tourism": "information"
-    }
+    },
+    "name": "Information"
 }
\ No newline at end of file
diff --git a/data/presets/presets/tourism/motel.json b/data/presets/presets/tourism/motel.json
index 6b50bd9a8..6db399b28 100644
--- a/data/presets/presets/tourism/motel.json
+++ b/data/presets/presets/tourism/motel.json
@@ -12,5 +12,6 @@
     ],
     "tags": {
         "tourism": "motel"
-    }
+    },
+    "name": "Motel"
 }
\ No newline at end of file
diff --git a/data/presets/presets/tourism/museum.json b/data/presets/presets/tourism/museum.json
index d0c5cca1e..b042e479b 100644
--- a/data/presets/presets/tourism/museum.json
+++ b/data/presets/presets/tourism/museum.json
@@ -27,5 +27,6 @@
     ],
     "tags": {
         "tourism": "museum"
-    }
+    },
+    "name": "Museum"
 }
\ No newline at end of file
diff --git a/data/presets/presets/tourism/picnic_site.json b/data/presets/presets/tourism/picnic_site.json
index 579a908a3..77651acef 100644
--- a/data/presets/presets/tourism/picnic_site.json
+++ b/data/presets/presets/tourism/picnic_site.json
@@ -12,5 +12,6 @@
     "terms": [],
     "tags": {
         "tourism": "picnic_site"
-    }
+    },
+    "name": "Picnic Site"
 }
\ No newline at end of file
diff --git a/data/presets/presets/tourism/theme_park.json b/data/presets/presets/tourism/theme_park.json
index ac18758f0..1a1ba2bb8 100644
--- a/data/presets/presets/tourism/theme_park.json
+++ b/data/presets/presets/tourism/theme_park.json
@@ -11,5 +11,6 @@
     ],
     "tags": {
         "tourism": "theme_park"
-    }
+    },
+    "name": "Theme Park"
 }
\ No newline at end of file
diff --git a/data/presets/presets/tourism/viewpoint.json b/data/presets/presets/tourism/viewpoint.json
index 7243fc3e1..950b8e672 100644
--- a/data/presets/presets/tourism/viewpoint.json
+++ b/data/presets/presets/tourism/viewpoint.json
@@ -5,5 +5,6 @@
     ],
     "tags": {
         "tourism": "viewpoint"
-    }
+    },
+    "name": "Viewpoint"
 }
\ No newline at end of file
diff --git a/data/presets/presets/tourism/zoo.json b/data/presets/presets/tourism/zoo.json
index fb0dbcdf1..a9c5c2c19 100644
--- a/data/presets/presets/tourism/zoo.json
+++ b/data/presets/presets/tourism/zoo.json
@@ -11,5 +11,6 @@
     ],
     "tags": {
         "tourism": "zoo"
-    }
+    },
+    "name": "Zoo"
 }
\ No newline at end of file
diff --git a/data/presets/presets/waterway.json b/data/presets/presets/waterway.json
index 3a8390202..7a5cfefa2 100644
--- a/data/presets/presets/waterway.json
+++ b/data/presets/presets/waterway.json
@@ -10,5 +10,6 @@
     ],
     "tags": {
         "waterway": "*"
-    }
+    },
+    "name": "Waterway"
 }
\ No newline at end of file
diff --git a/data/presets/presets/waterway/canal.json b/data/presets/presets/waterway/canal.json
index 478a40424..3b865d20e 100644
--- a/data/presets/presets/waterway/canal.json
+++ b/data/presets/presets/waterway/canal.json
@@ -5,5 +5,6 @@
     ],
     "tags": {
         "waterway": "canal"
-    }
+    },
+    "name": "Canal"
 }
\ No newline at end of file
diff --git a/data/presets/presets/waterway/dam.json b/data/presets/presets/waterway/dam.json
index 73460abe3..32aabe12a 100644
--- a/data/presets/presets/waterway/dam.json
+++ b/data/presets/presets/waterway/dam.json
@@ -8,5 +8,6 @@
     ],
     "tags": {
         "waterway": "dam"
-    }
+    },
+    "name": "Dam"
 }
\ No newline at end of file
diff --git a/data/presets/presets/waterway/ditch.json b/data/presets/presets/waterway/ditch.json
index 4fc3e2101..a19605e06 100644
--- a/data/presets/presets/waterway/ditch.json
+++ b/data/presets/presets/waterway/ditch.json
@@ -5,5 +5,6 @@
     ],
     "tags": {
         "waterway": "ditch"
-    }
+    },
+    "name": "Ditch"
 }
\ No newline at end of file
diff --git a/data/presets/presets/waterway/drain.json b/data/presets/presets/waterway/drain.json
index 81619b059..aade05796 100644
--- a/data/presets/presets/waterway/drain.json
+++ b/data/presets/presets/waterway/drain.json
@@ -5,5 +5,6 @@
     ],
     "tags": {
         "waterway": "drain"
-    }
+    },
+    "name": "Drain"
 }
\ No newline at end of file
diff --git a/data/presets/presets/waterway/river.json b/data/presets/presets/waterway/river.json
index ba83ee7ee..5193af05b 100644
--- a/data/presets/presets/waterway/river.json
+++ b/data/presets/presets/waterway/river.json
@@ -20,5 +20,6 @@
     ],
     "tags": {
         "waterway": "river"
-    }
+    },
+    "name": "River"
 }
\ No newline at end of file
diff --git a/data/presets/presets/waterway/riverbank.json b/data/presets/presets/waterway/riverbank.json
index cc533cb45..3ddbfbdaa 100644
--- a/data/presets/presets/waterway/riverbank.json
+++ b/data/presets/presets/waterway/riverbank.json
@@ -5,5 +5,6 @@
     ],
     "tags": {
         "waterway": "riverbank"
-    }
+    },
+    "name": "Riverbank"
 }
\ No newline at end of file
diff --git a/data/presets/presets/waterway/stream.json b/data/presets/presets/waterway/stream.json
index ef01a6e67..3257f92a1 100644
--- a/data/presets/presets/waterway/stream.json
+++ b/data/presets/presets/waterway/stream.json
@@ -35,5 +35,6 @@
     ],
     "tags": {
         "waterway": "stream"
-    }
+    },
+    "name": "Stream"
 }
\ No newline at end of file
diff --git a/data/presets/presets/waterway/weir.json b/data/presets/presets/waterway/weir.json
index a3d60c4f2..5b20c1c9f 100644
--- a/data/presets/presets/waterway/weir.json
+++ b/data/presets/presets/waterway/weir.json
@@ -6,5 +6,6 @@
     ],
     "tags": {
         "waterway": "weir"
-    }
+    },
+    "name": "Weir"
 }
\ No newline at end of file