diff --git a/data/deprecated.json b/data/deprecated.json
index 4e9d137ad..302ec0294 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -24,10 +24,18 @@
       "old": {"amenity": "citymap_post"},
       "replace": {"tourism": "information"}
     },
+    {
+      "old": {"amenity": "club"},
+      "replace": {"club": "*"}
+    },
     {
       "old": {"amenity": "community_center"},
       "replace": {"amenity": "community_centre"}
     },
+    {
+      "old": {"amenity": "dancing_school"},
+      "replace": {"leisure": "dance", "dance:teaching": "yes" }
+    },
     {
       "old": {"amenity": "dog_bin"},
       "replace": {"amenity": "waste_basket", "waste": "dog_excrement"}
@@ -108,6 +116,10 @@
       "old": {"amenity": "sloped_curb"},
       "replace": {"kerb": "lowered"}
     },
+    {
+      "old": {"amenity": "social_club"},
+      "replace": {"club": "*"}
+    },
     {
       "old": {"amenity": "swimming_pool"},
       "replace": {"leisure": "swimming_pool"}
@@ -419,6 +431,10 @@
       "old": {"leisure": "club"},
       "replace": {"club": "*"}
     },
+    {
+      "old": {"leisure": "social_club"},
+      "replace": {"club": "*"}
+    },
     {
       "old": {"leisure": "video_arcade"},
       "replace": {"leisure": "amusement_arcade"}
diff --git a/data/presets.yaml b/data/presets.yaml
index 871484db1..a86454aaa 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3591,6 +3591,10 @@ en:
         # building=greenhouse
         name: Greenhouse
         terms: '<translate with synonyms or related terms for ''Greenhouse'', separated by commas>'
+      building/hangar:
+        # building=hangar
+        name: Hangar Building
+        terms: '<translate with synonyms or related terms for ''Hangar Building'', separated by commas>'
       building/hospital:
         # building=hospital
         name: Hospital Building
@@ -5164,6 +5168,10 @@ en:
         name: Antenna
         # 'terms: broadcast,cell phone,cell,communication,mobile phone,radio,television,transmission,tv'
         terms: '<translate with synonyms or related terms for ''Antenna'', separated by commas>'
+      man_made/beacon:
+        # man_made=beacon
+        name: Beacon
+        terms: '<translate with synonyms or related terms for ''Beacon'', separated by commas>'
       man_made/beehive:
         # man_made=beehive
         name: Beehive
@@ -5199,6 +5207,11 @@ en:
         # man_made=cutline
         name: Cut line
         terms: '<translate with synonyms or related terms for ''Cut line'', separated by commas>'
+      man_made/dyke:
+        # man_made=dyke
+        name: Levee
+        # 'terms: Dike,Dyke,Floodbank,Stopbank'
+        terms: '<translate with synonyms or related terms for ''Levee'', separated by commas>'
       man_made/embankment:
         # man_made=embankment
         name: Embankment
@@ -5333,6 +5346,11 @@ en:
         name: Communication Tower
         # 'terms: antenna,broadcast tower,cell phone tower,cell tower,communication mast,communication tower,guyed tower,mobile phone tower,radio mast,radio tower,television tower,transmission mast,transmission tower,tv tower'
         terms: '<translate with synonyms or related terms for ''Communication Tower'', separated by commas>'
+      man_made/tower/defensive:
+        # 'man_made=tower, tower:type=defensive'
+        name: Fortified Tower
+        # 'terms: Defensive Tower,Castle Tower'
+        terms: '<translate with synonyms or related terms for ''Fortified Tower'', separated by commas>'
       man_made/tower/minaret:
         # 'man_made=tower, tower:type=minaret'
         name: Minaret
@@ -6685,6 +6703,11 @@ en:
         name: Bottled Gas Shop
         # 'terms: cng,lpg,natural gas,propane,refill,tank'
         terms: '<translate with synonyms or related terms for ''Bottled Gas Shop'', separated by commas>'
+      shop/general:
+        # shop=general
+        name: General Store
+        # 'terms: Village Shop'
+        terms: '<translate with synonyms or related terms for ''General Store'', separated by commas>'
       shop/gift:
         # shop=gift
         name: Gift Shop
@@ -7140,6 +7163,10 @@ en:
         name: Trail Marker
         # 'terms: cairn,painted blaze,route flag,route marker,stone pile,trail blaze,trail post,way marker'
         terms: '<translate with synonyms or related terms for ''Trail Marker'', separated by commas>'
+      tourism/information/terminal:
+        # 'tourism=information, information=terminal'
+        name: Information Terminal
+        terms: '<translate with synonyms or related terms for ''Information Terminal'', separated by commas>'
       tourism/motel:
         # tourism=motel
         name: Motel
diff --git a/data/presets/README.md b/data/presets/README.md
index 7eb8094ff..1f313c3aa 100644
--- a/data/presets/README.md
+++ b/data/presets/README.md
@@ -199,6 +199,17 @@ The ID of a preset that is preferable to this one. iD's validator will flag feat
 
 When possible, use `deprecated.json` instead to specify upgrade paths for old tags. This property is meant for special cases, such as upgrades with geometry requirements.
 
+##### `reference`
+
+A key and optionally a value to link to the wiki documentation for this preset. Only necessary if the preset consists of several tags.
+
+For example, 
+```javascript
+"reference": {
+    "key": "tower:type",
+    "value": "communication"
+}
+```
 
 ## Fields
 
diff --git a/data/presets/presets.json b/data/presets/presets.json
index a04b2e0fd..3ae8db3ac 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -41,7 +41,7 @@
     "aeroway/aerodrome": {"icon": "maki-airport", "geometry": ["point", "area"], "fields": ["name", "iata", "icao", "operator", "internet_access", "internet_access/fee", "internet_access/ssid"], "terms": ["aerodrome", "aeroway", "airplane", "airport", "jet", "plane"], "tags": {"aeroway": "aerodrome"}, "matchScore": 0.9, "name": "Airport"},
     "aeroway/apron": {"icon": "maki-airport", "geometry": ["area"], "terms": ["ramp"], "fields": ["ref", "surface"], "tags": {"aeroway": "apron"}, "name": "Apron"},
     "aeroway/gate": {"icon": "maki-airport", "geometry": ["point"], "fields": ["ref_aeroway_gate"], "tags": {"aeroway": "gate"}, "name": "Airport Gate"},
-    "aeroway/hangar": {"geometry": ["area"], "fields": ["name", "building_area"], "tags": {"aeroway": "hangar"}, "name": "Hangar"},
+    "aeroway/hangar": {"geometry": ["area"], "fields": ["name", "building_area"], "tags": {"aeroway": "hangar"}, "addTags": {"building": "hangar", "aeroway": "hangar"}, "removeTags": {"building": "hangar", "aeroway": "hangar"}, "name": "Hangar"},
     "aeroway/helipad": {"icon": "maki-heliport", "geometry": ["point", "area"], "fields": ["ref"], "terms": ["helicopter", "helipad", "heliport"], "tags": {"aeroway": "helipad"}, "name": "Helipad"},
     "aeroway/jet_bridge": {"icon": "temaki-pedestrian", "geometry": ["line"], "fields": ["ref_aeroway_gate", "width", "access_simple", "wheelchair"], "moreFields": ["manufacturer"], "terms": ["aerobridge", "air jetty", "airbridge", "finger", "gangway", "jet way", "jetway", "passenger boarding bridge", "PBB", "portal", "skybridge", "terminal gate connector"], "tags": {"aeroway": "jet_bridge"}, "addTags": {"aeroway": "jet_bridge", "highway": "corridor"}, "removeTags": {"aeroway": "jet_bridge", "highway": "corridor"}, "matchScore": 1.05, "name": "Jet Bridge"},
     "aeroway/runway": {"icon": "fas-plane-departure", "geometry": ["line", "area"], "terms": ["landing strip"], "fields": ["ref_runway", "surface", "length", "width"], "tags": {"aeroway": "runway"}, "name": "Runway"},
@@ -307,6 +307,7 @@
     "building/garages": {"icon": "fas-warehouse", "fields": ["{building}", "capacity"], "geometry": ["area"], "tags": {"building": "garages"}, "matchScore": 0.5, "name": "Garages"},
     "building/grandstand": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "grandstand"}, "terms": ["tribune", "stand", "stands", "bleachers"], "matchScore": 0.5, "name": "Grandstand"},
     "building/greenhouse": {"icon": "maki-garden-centre", "geometry": ["area"], "tags": {"building": "greenhouse"}, "matchScore": 0.5, "name": "Greenhouse"},
+    "building/hangar": {"fields": ["name"], "geometry": ["area"], "tags": {"building": "hangar"}, "matchScore": 0.5, "name": "Hangar Building"},
     "building/hospital": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "hospital"}, "matchScore": 0.5, "name": "Hospital Building"},
     "building/hotel": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "hotel"}, "matchScore": 0.5, "name": "Hotel Building"},
     "building/house": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "house"}, "terms": ["home", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "House"},
@@ -647,6 +648,7 @@
     "line": {"fields": ["name"], "geometry": ["line"], "tags": {}, "terms": ["polyline"], "name": "Line", "matchScore": 0.1},
     "man_made/adit": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["name", "operator", "resource", "direction"], "terms": ["cave", "horizontal mine entrance", "tunnel", "underground"], "tags": {"man_made": "adit"}, "name": "Adit"},
     "man_made/antenna": {"icon": "temaki-antenna", "fields": ["communication_multi", "operator", "manufacturer", "height"], "geometry": ["point"], "terms": ["broadcast", "cell phone", "cell", "communication", "mobile phone", "radio", "television", "transmission", "tv"], "tags": {"man_made": "antenna"}, "name": "Antenna"},
+    "man_made/beacon": {"fields": ["name", "height"], "moreFields": ["seamark/type"], "geometry": ["point", "area"], "tags": {"man_made": "beacon"}, "name": "Beacon", "matchScore": 0.5},
     "man_made/beehive": {"icon": "fas-archive", "geometry": ["point", "area"], "fields": ["ref", "operator", "seasonal", "height", "colour"], "moreFields": ["manufacturer"], "terms": ["apiary", "beekeeper", "farm", "honey", "pollination"], "tags": {"man_made": "beehive"}, "name": "Beehive"},
     "man_made/breakwater": {"fields": ["material", "seamark/type"], "geometry": ["line", "area"], "tags": {"man_made": "breakwater"}, "name": "Breakwater"},
     "man_made/bridge": {"icon": "maki-bridge", "fields": ["name", "bridge", "layer", "maxweight"], "moreFields": ["manufacturer", "material", "seamark/type"], "geometry": ["area"], "tags": {"man_made": "bridge"}, "addTags": {"man_made": "bridge", "layer": "1"}, "removeTags": {"man_made": "bridge", "layer": "*"}, "reference": {"key": "man_made", "value": "bridge"}, "name": "Bridge"},
@@ -655,6 +657,7 @@
     "man_made/clearcut": {"icon": "maki-logging", "geometry": ["area"], "tags": {"man_made": "clearcut"}, "terms": ["cut", "forest", "lumber", "tree", "wood"], "name": "Clearcut Forest"},
     "man_made/crane": {"icon": "temaki-crane", "fields": ["operator", "manufacturer", "height", "crane/type"], "geometry": ["point", "line", "vertex", "area"], "tags": {"man_made": "crane"}, "name": "Crane"},
     "man_made/cutline": {"icon": "maki-logging", "geometry": ["line"], "tags": {"man_made": "cutline"}, "name": "Cut line"},
+    "man_made/dyke": {"geometry": ["line"], "tags": {"man_made": "dyke"}, "terms": ["Dike", "Dyke", "Floodbank", "Stopbank"], "name": "Levee"},
     "man_made/embankment": {"geometry": ["line"], "tags": {"man_made": "embankment"}, "name": "Embankment"},
     "man_made/flagpole": {"icon": "maki-embassy", "fields": ["operator", "flag/type", "country", "lit", "height"], "moreFields": ["manufacturer", "material"], "geometry": ["point", "vertex"], "tags": {"man_made": "flagpole"}, "name": "Flagpole"},
     "man_made/gasometer": {"icon": "temaki-storage_tank", "fields": ["content", "building_area"], "geometry": ["point", "area"], "terms": ["gas holder"], "tags": {"man_made": "gasometer"}, "name": "Gasometer"},
@@ -683,6 +686,7 @@
     "man_made/tower": {"icon": "temaki-tower", "fields": ["tower/type", "tower/construction", "height", "building_area"], "moreFields": ["architect"], "geometry": ["point", "area"], "tags": {"man_made": "tower"}, "name": "Tower"},
     "man_made/tower/bell_tower": {"icon": "fas-bell", "moreFields": ["{man_made/tower}", "opening_hours"], "geometry": ["point", "area"], "terms": ["belfry", "bell gable", "campanile", "church tower", "klockstapel"], "tags": {"man_made": "tower", "tower:type": "bell_tower"}, "reference": {"key": "tower:type", "value": "bell_tower"}, "name": "Bell Tower"},
     "man_made/tower/communication": {"icon": "temaki-tower", "fields": ["{man_made/tower}", "communication_multi"], "geometry": ["point", "area"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "tower", "tower:type": "communication"}, "reference": {"key": "tower:type", "value": "communication"}, "name": "Communication Tower"},
+    "man_made/tower/defensive": {"icon": "maki-castle", "geometry": ["point", "area"], "tags": {"man_made": "tower", "tower:type": "defensive"}, "reference": {"key": "tower:type", "value": "defensive"}, "terms": ["Defensive Tower", "Castle Tower"], "name": "Fortified Tower"},
     "man_made/tower/minaret": {"icon": "temaki-tower", "geometry": ["point", "area"], "terms": ["Islam", "mosque", "Muezzin", "Muslim"], "tags": {"man_made": "tower", "tower:type": "minaret"}, "reference": {"key": "tower:type", "value": "minaret"}, "name": "Minaret"},
     "man_made/tower/observation": {"icon": "temaki-tower", "moreFields": ["{man_made/tower}", "opening_hours"], "geometry": ["point", "area"], "terms": ["lookout tower", "fire tower"], "tags": {"man_made": "tower", "tower:type": "observation"}, "reference": {"key": "tower:type", "value": "observation"}, "name": "Observation Tower"},
     "man_made/tunnel": {"icon": "tnp-2009642", "fields": ["name", "tunnel", "layer", "width", "length", "height"], "geometry": ["area"], "tags": {"man_made": "tunnel"}, "addTags": {"man_made": "tunnel", "layer": "-1"}, "removeTags": {"man_made": "tunnel", "layer": "*"}, "reference": {"key": "man_made", "value": "tunnel"}, "terms": ["bore", "dig", "shaft", "underground passage", "underpass"], "name": "Tunnel"},
@@ -976,6 +980,7 @@
     "shop/games": {"icon": "fas-dice", "geometry": ["point", "area"], "tags": {"shop": "games"}, "terms": ["board game", "card game", "dice game", "game shop", "live action role-playing game", "miniatures wargame", "strategy game"], "name": "Tabletop Game Store"},
     "shop/garden_centre": {"icon": "maki-garden-centre", "geometry": ["point", "area"], "terms": ["landscape", "mulch", "shrub", "tree"], "tags": {"shop": "garden_centre"}, "name": "Garden Center"},
     "shop/gas": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["cng", "lpg", "natural gas", "propane", "refill", "tank"], "tags": {"shop": "gas"}, "name": "Bottled Gas Shop"},
+    "shop/general": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "general"}, "terms": ["Village Shop"], "name": "General Store"},
     "shop/gift": {"icon": "maki-gift", "geometry": ["point", "area"], "terms": ["souvenir"], "tags": {"shop": "gift"}, "name": "Gift Shop"},
     "shop/greengrocer": {"icon": "fas-carrot", "geometry": ["point", "area"], "terms": ["fruit", "produce", "vegetable"], "tags": {"shop": "greengrocer"}, "name": "Greengrocer"},
     "shop/hairdresser_supply": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["barber", "shampoo", "conditioner"], "tags": {"shop": "hairdresser_supply"}, "name": "Hairdresser Supply Store"},
@@ -1074,6 +1079,7 @@
     "tourism/information/map": {"icon": "fas-map", "fields": ["operator", "map_type", "map_size", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "map"}, "reference": {"key": "information", "value": "map"}, "name": "Map"},
     "tourism/information/office": {"icon": "maki-information", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information", "information": "office"}, "reference": {"key": "information", "value": "office"}, "name": "Tourist Information Office"},
     "tourism/information/route_marker": {"icon": "maki-information", "fields": ["ref", "operator", "colour", "material", "elevation"], "geometry": ["point", "vertex"], "terms": ["cairn", "painted blaze", "route flag", "route marker", "stone pile", "trail blaze", "trail post", "way marker"], "tags": {"tourism": "information", "information": "route_marker"}, "reference": {"key": "information", "value": "route_marker"}, "name": "Trail Marker"},
+    "tourism/information/terminal": {"icon": "maki-information", "fields": ["operator"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "terminal"}, "reference": {"key": "information", "value": "terminal"}, "name": "Information Terminal"},
     "tourism/motel": {"icon": "maki-lodging", "fields": ["name", "brand", "address", "building_area", "rooms", "internet_access"], "moreFields": ["air_conditioning", "email", "fax", "internet_access/fee", "internet_access/ssid", "operator", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "name": "Motel"},
     "tourism/museum": {"icon": "temaki-museum", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "fee", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery", "foundation", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum"}, "name": "Museum"},
     "tourism/picnic_site": {"icon": "maki-picnic-site", "fields": ["name", "operator", "address", "access_simple", "capacity"], "moreFields": ["smoking", "fee", "payment_multi_fee", "phone", "reservation", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["camp"], "tags": {"tourism": "picnic_site"}, "name": "Picnic Site"},
diff --git a/data/presets/presets/aeroway/hangar.json b/data/presets/presets/aeroway/hangar.json
index 5f8c2ae64..4fe765ede 100644
--- a/data/presets/presets/aeroway/hangar.json
+++ b/data/presets/presets/aeroway/hangar.json
@@ -9,5 +9,13 @@
     "tags": {
         "aeroway": "hangar"
     },
+    "addTags": {
+        "building": "hangar",
+        "aeroway": "hangar"
+    },
+    "removeTags": {
+        "building": "hangar",
+        "aeroway": "hangar"
+    },
     "name": "Hangar"
 }
diff --git a/data/presets/presets/building/hangar.json b/data/presets/presets/building/hangar.json
new file mode 100644
index 000000000..9faff8227
--- /dev/null
+++ b/data/presets/presets/building/hangar.json
@@ -0,0 +1,13 @@
+{
+    "fields": [
+        "name"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "hangar"
+    },
+    "matchScore": 0.5,
+    "name": "Hangar Building"
+}
diff --git a/data/presets/presets/man_made/beacon.json b/data/presets/presets/man_made/beacon.json
new file mode 100644
index 000000000..abba520cc
--- /dev/null
+++ b/data/presets/presets/man_made/beacon.json
@@ -0,0 +1,18 @@
+{
+    "fields": [
+        "name",
+        "height"
+    ],
+    "moreFields": [
+        "seamark/type"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "man_made": "beacon"
+    },
+    "name": "Beacon",
+    "matchScore": 0.5
+}
diff --git a/data/presets/presets/man_made/dyke.json b/data/presets/presets/man_made/dyke.json
new file mode 100644
index 000000000..88304126c
--- /dev/null
+++ b/data/presets/presets/man_made/dyke.json
@@ -0,0 +1,12 @@
+{
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "man_made": "dyke"
+    },
+    "terms": [
+        "Dike", "Dyke", "Floodbank", "Stopbank"
+    ],
+    "name": "Levee"
+}
diff --git a/data/presets/presets/man_made/tower/defensive.json b/data/presets/presets/man_made/tower/defensive.json
new file mode 100644
index 000000000..9b3ffbaa5
--- /dev/null
+++ b/data/presets/presets/man_made/tower/defensive.json
@@ -0,0 +1,20 @@
+{
+    "icon": "maki-castle",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "man_made": "tower",
+        "tower:type": "defensive"
+    },
+    "reference": {
+        "key": "tower:type",
+        "value": "defensive"
+    },
+    "terms": [
+        "Defensive Tower",
+        "Castle Tower"
+    ],
+    "name": "Fortified Tower"
+}
diff --git a/data/presets/presets/shop/general.json b/data/presets/presets/shop/general.json
new file mode 100644
index 000000000..07c330e21
--- /dev/null
+++ b/data/presets/presets/shop/general.json
@@ -0,0 +1,12 @@
+{
+    "icon": "maki-shop",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "general"
+    },
+    "terms": ["Village Shop"],
+    "name": "General Store"
+}
diff --git a/data/presets/presets/tourism/information/terminal.json b/data/presets/presets/tourism/information/terminal.json
new file mode 100644
index 000000000..862f43b40
--- /dev/null
+++ b/data/presets/presets/tourism/information/terminal.json
@@ -0,0 +1,19 @@
+{
+    "icon": "maki-information",
+    "fields": [
+        "operator"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "tourism": "information",
+        "information": "terminal"
+    },
+    "reference": {
+        "key": "information",
+        "value": "terminal"
+    },
+    "name": "Information Terminal"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index c1048fe15..1d37870b5 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -303,6 +303,7 @@
     {"key": "building", "value": "garages", "description": "🄿 Garages", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-warehouse.svg?sanitize=true"},
     {"key": "building", "value": "grandstand", "description": "🄿 Grandstand", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/building-15.svg?sanitize=true"},
     {"key": "building", "value": "greenhouse", "description": "🄿 Greenhouse", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/garden-centre-15.svg?sanitize=true"},
+    {"key": "building", "value": "hangar", "description": "🄿 Hangar Building", "object_types": ["area"]},
     {"key": "building", "value": "hospital", "description": "🄿 Hospital Building", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/building-15.svg?sanitize=true"},
     {"key": "building", "value": "hotel", "description": "🄿 Hotel Building", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/building-15.svg?sanitize=true"},
     {"key": "building", "value": "house", "description": "🄿 House", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/home-15.svg?sanitize=true"},
@@ -622,6 +623,7 @@
     {"key": "leisure", "value": "water_park", "description": "🄿 Water Park", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/swimming-15.svg?sanitize=true"},
     {"key": "man_made", "value": "adit", "description": "🄿 Adit", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/triangle-15.svg?sanitize=true"},
     {"key": "man_made", "value": "antenna", "description": "🄿 Antenna", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/antenna.svg?sanitize=true"},
+    {"key": "man_made", "value": "beacon", "description": "🄿 Beacon", "object_types": ["node", "area"]},
     {"key": "man_made", "value": "beehive", "description": "🄿 Beehive", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-archive.svg?sanitize=true"},
     {"key": "man_made", "value": "breakwater", "description": "🄿 Breakwater", "object_types": ["way", "area"]},
     {"key": "man_made", "value": "bridge", "description": "🄿 Bridge", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bridge-15.svg?sanitize=true"},
@@ -630,6 +632,7 @@
     {"key": "man_made", "value": "clearcut", "description": "🄿 Clearcut Forest", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/logging-15.svg?sanitize=true"},
     {"key": "man_made", "value": "crane", "description": "🄿 Crane", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/crane.svg?sanitize=true"},
     {"key": "man_made", "value": "cutline", "description": "🄿 Cut line", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/logging-15.svg?sanitize=true"},
+    {"key": "man_made", "value": "dyke", "description": "🄿 Levee", "object_types": ["way"]},
     {"key": "man_made", "value": "embankment", "description": "🄿 Embankment", "object_types": ["way"]},
     {"key": "man_made", "value": "flagpole", "description": "🄿 Flagpole", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/embassy-15.svg?sanitize=true"},
     {"key": "man_made", "value": "gasometer", "description": "🄿 Gasometer", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/storage_tank.svg?sanitize=true"},
@@ -657,6 +660,7 @@
     {"key": "man_made", "value": "survey_point", "description": "🄿 Survey Point", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/monument-15.svg?sanitize=true"},
     {"key": "man_made", "value": "tower", "description": "🄿 Tower", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tower.svg?sanitize=true"},
     {"key": "tower:type", "value": "bell_tower", "description": "🄿 Bell Tower", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-bell.svg?sanitize=true"},
+    {"key": "tower:type", "value": "defensive", "description": "🄿 Fortified Tower", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/castle-15.svg?sanitize=true"},
     {"key": "tower:type", "value": "minaret", "description": "🄿 Minaret", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tower.svg?sanitize=true"},
     {"key": "tower:type", "value": "observation", "description": "🄿 Observation Tower", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tower.svg?sanitize=true"},
     {"key": "man_made", "value": "tunnel", "description": "🄿 Tunnel", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/the-noun-project/2009642.svg?sanitize=true"},
@@ -915,6 +919,7 @@
     {"key": "shop", "value": "games", "description": "🄿 Tabletop Game Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-dice.svg?sanitize=true"},
     {"key": "shop", "value": "garden_centre", "description": "🄿 Garden Center", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/garden-centre-15.svg?sanitize=true"},
     {"key": "shop", "value": "gas", "description": "🄿 Bottled Gas Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
+    {"key": "shop", "value": "general", "description": "🄿 General Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "gift", "description": "🄿 Gift Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/gift-15.svg?sanitize=true"},
     {"key": "shop", "value": "greengrocer", "description": "🄿 Greengrocer", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-carrot.svg?sanitize=true"},
     {"key": "shop", "value": "hairdresser_supply", "description": "🄿 Hairdresser Supply Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
@@ -1013,6 +1018,7 @@
     {"key": "information", "value": "map", "description": "🄿 Map", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-map.svg?sanitize=true"},
     {"key": "information", "value": "office", "description": "🄿 Tourist Information Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/information-15.svg?sanitize=true"},
     {"key": "information", "value": "route_marker", "description": "🄿 Trail Marker", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/information-15.svg?sanitize=true"},
+    {"key": "information", "value": "terminal", "description": "🄿 Information Terminal", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/information-15.svg?sanitize=true"},
     {"key": "tourism", "value": "motel", "description": "🄿 Motel", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/lodging-15.svg?sanitize=true"},
     {"key": "tourism", "value": "museum", "description": "🄿 Museum", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/museum.svg?sanitize=true"},
     {"key": "tourism", "value": "picnic_site", "description": "🄿 Picnic Site", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/picnic-site-15.svg?sanitize=true"},
@@ -1707,7 +1713,9 @@
     {"key": "amenity", "value": "artwork", "description": "🄳 ➜ tourism=artwork"},
     {"key": "amenity", "value": "car_repair", "description": "🄳 ➜ shop=car_repair"},
     {"key": "amenity", "value": "citymap_post", "description": "🄳 ➜ tourism=information"},
+    {"key": "amenity", "value": "club", "description": "🄳 ➜ club=*"},
     {"key": "amenity", "value": "community_center", "description": "🄳 ➜ amenity=community_centre"},
+    {"key": "amenity", "value": "dancing_school", "description": "🄳 ➜ leisure=dance + dance:teaching=yes"},
     {"key": "amenity", "value": "dog_bin", "description": "🄳 ➜ amenity=waste_basket + waste=dog_excrement"},
     {"key": "amenity", "value": "dog_waste_bin", "description": "🄳 ➜ amenity=waste_basket + waste=dog_excrement"},
     {"key": "amenity", "value": "ev_charging", "description": "🄳 ➜ amenity=charging_station"},
@@ -1725,6 +1733,7 @@
     {"key": "amenity", "value": "sauna", "description": "🄳 ➜ leisure=sauna"},
     {"key": "amenity", "value": "shop", "description": "🄳 ➜ shop=*"},
     {"key": "amenity", "value": "sloped_curb", "description": "🄳 ➜ kerb=lowered"},
+    {"key": "amenity", "value": "social_club", "description": "🄳 ➜ club=*"},
     {"key": "amenity", "value": "ticket_booth", "description": "🄳 ➜ shop=ticket"},
     {"key": "amenity", "value": "toilet", "description": "🄳 ➜ amenity=toilets"},
     {"key": "amenity", "value": "winery", "description": "🄳 ➜ craft=winery"},
@@ -1789,6 +1798,7 @@
     {"key": "landuse", "value": "wood", "description": "🄳 ➜ natural=wood"},
     {"key": "leisure", "value": "beach", "description": "🄳 ➜ natural=beach"},
     {"key": "leisure", "value": "club", "description": "🄳 ➜ club=*"},
+    {"key": "leisure", "value": "social_club", "description": "🄳 ➜ club=*"},
     {"key": "leisure", "value": "video_arcade", "description": "🄳 ➜ leisure=amusement_arcade"},
     {"key": "man_made", "value": "cut_line", "description": "🄳 ➜ man_made=cutline"},
     {"key": "man_made", "value": "jetty", "description": "🄳 ➜ highway=footway + man_made=pier"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 17ed154d1..2abc06162 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -5442,6 +5442,10 @@
                     "name": "Greenhouse",
                     "terms": ""
                 },
+                "building/hangar": {
+                    "name": "Hangar Building",
+                    "terms": ""
+                },
                 "building/hospital": {
                     "name": "Hospital Building",
                     "terms": ""
@@ -6802,6 +6806,10 @@
                     "name": "Antenna",
                     "terms": "broadcast,cell phone,cell,communication,mobile phone,radio,television,transmission,tv"
                 },
+                "man_made/beacon": {
+                    "name": "Beacon",
+                    "terms": ""
+                },
                 "man_made/beehive": {
                     "name": "Beehive",
                     "terms": "apiary,beekeeper,farm,honey,pollination"
@@ -6834,6 +6842,10 @@
                     "name": "Cut line",
                     "terms": ""
                 },
+                "man_made/dyke": {
+                    "name": "Levee",
+                    "terms": "Dike,Dyke,Floodbank,Stopbank"
+                },
                 "man_made/embankment": {
                     "name": "Embankment",
                     "terms": ""
@@ -6946,6 +6958,10 @@
                     "name": "Communication Tower",
                     "terms": "antenna,broadcast tower,cell phone tower,cell tower,communication mast,communication tower,guyed tower,mobile phone tower,radio mast,radio tower,television tower,transmission mast,transmission tower,tv tower"
                 },
+                "man_made/tower/defensive": {
+                    "name": "Fortified Tower",
+                    "terms": "Defensive Tower,Castle Tower"
+                },
                 "man_made/tower/minaret": {
                     "name": "Minaret",
                     "terms": "Islam,mosque,Muezzin,Muslim"
@@ -8118,6 +8134,10 @@
                     "name": "Bottled Gas Shop",
                     "terms": "cng,lpg,natural gas,propane,refill,tank"
                 },
+                "shop/general": {
+                    "name": "General Store",
+                    "terms": "Village Shop"
+                },
                 "shop/gift": {
                     "name": "Gift Shop",
                     "terms": "souvenir"
@@ -8510,6 +8530,10 @@
                     "name": "Trail Marker",
                     "terms": "cairn,painted blaze,route flag,route marker,stone pile,trail blaze,trail post,way marker"
                 },
+                "tourism/information/terminal": {
+                    "name": "Information Terminal",
+                    "terms": ""
+                },
                 "tourism/motel": {
                     "name": "Motel",
                     "terms": ""