Merge branch 'master' into tag-colour-preview-rebase

[rails.git] / vendor / assets / iD / iD / locales / en.json
diff --git a/vendor/assets/iD/iD/locales/en.json b/vendor/assets/iD/iD/locales/en.json

index d5d2fb7b091dbca464d8b29effdfca40fb9cb4e5..dbadbb17b7d1410289d83699fa7dde90a3cf9378 100644 (file)
--- a/vendor/assets/iD/iD/locales/en.json
+++ b/vendor/assets/iD/iD/locales/en.json
@@ -504,7 +504,8 @@
              "translate": "Translate",
              "localized_translation_label": "Multilingual Name",
              "localized_translation_language": "Choose language",
              "translate": "Translate",
              "localized_translation_label": "Multilingual Name",
              "localized_translation_language": "Choose language",
-            "localized_translation_name": "Name"
+            "localized_translation_name": "Name",
+            "language_and_code": "{language} ({code})"
          },
          "zoom_in_edit": "Zoom in to edit",
          "login": "Log In",
          },
          "zoom_in_edit": "Zoom in to edit",
          "login": "Log In",
@@ -1740,6 +1741,20 @@
                      "reference": "Google products are proprietary and must not be used as references."
                  }
              },
                      "reference": "Google products are proprietary and must not be used as references."
                  }
              },
+            "invalid_format": {
+                "title": "Invalid Formatting",
+                "tip": "Find tags with unexpected formats",
+                "email": {
+                    "message": "{feature} has an invalid email address.",
+                    "message_multi": "{feature} has multiple invalid email addresses.",
+                    "reference": "Email addresses must look like \"user@example.com\"."
+                },
+                "website": {
+                    "message": "{feature} has an invalid website.",
+                    "message_multi": "{feature} has multiple invalid websites.",
+                    "reference": "Websites should start with \"http\" or \"https\"."
+                }
+            },
              "missing_role": {
                  "title": "Missing Roles",
                  "message": "{member} has no role within {relation}",
              "missing_role": {
                  "title": "Missing Roles",
                  "message": "{member} has no role within {relation}",
@@ -1774,6 +1789,10 @@
                  "incomplete": {
                      "message": "{feature} has incomplete tags",
                      "reference": "Some features should have additional tags."
                  "incomplete": {
                      "message": "{feature} has incomplete tags",
                      "reference": "Some features should have additional tags."
+                },
+                "noncanonical_brand": {
+                    "message": "{feature} looks like a brand with nonstandard tags",
+                    "reference": "All features of the same brand should be tagged the same way."
                  }
              },
              "private_data": {
                  }
              },
              "private_data": {
@@ -1844,6 +1863,9 @@
                  "connect_features": {
                      "title": "Connect the features"
                  },
                  "connect_features": {
                      "title": "Connect the features"
                  },
+                "connect_using_ford": {
+                    "title": "Connect using a ford"
+                },
                  "continue_from_start": {
                      "title": "Continue drawing from start"
                  },
                  "continue_from_start": {
                      "title": "Continue drawing from start"
                  },
@@ -1934,6 +1956,9 @@
                  "use_different_layers": {
                      "title": "Use different layers"
                  },
                  "use_different_layers": {
                      "title": "Use different layers"
                  },
+                "use_different_layers_or_levels": {
+                    "title": "Use different layers or levels"
+                },
                  "use_different_levels": {
                      "title": "Use different levels"
                  },
                  "use_different_levels": {
                      "title": "Use different levels"
                  },
@@ -2395,10 +2420,12 @@
              },
              "fields": {
                  "access_simple": {
              },
              "fields": {
                  "access_simple": {
-                    "label": "Allowed Access"
+                    "label": "Allowed Access",
+                    "terms": "permitted,private,public"
                  },
                  "access": {
                      "label": "Allowed Access",
                  },
                  "access": {
                      "label": "Allowed Access",
+                    "terms": "",
                      "placeholder": "Not Specified",
                      "types": {
                          "access": "All",
                      "placeholder": "Not Specified",
                      "types": {
                          "access": "All",
@@ -2442,8 +2469,19 @@
                          }
                      }
                  },
                          }
                      }
                  },
+                "addr/interpolation": {
+                    "label": "Type",
+                    "terms": "",
+                    "options": {
+                        "all": "All",
+                        "even": "Even",
+                        "odd": "Odd",
+                        "alphabetic": "Alphabetic"
+                    }
+                },
                  "address": {
                      "label": "Address",
                  "address": {
                      "label": "Address",
+                    "terms": "location",
                      "placeholders": {
                          "block_number": "Block Number",
                          "block_number!jp": "Block No.",
                      "placeholders": {
                          "block_number": "Block Number",
                          "block_number!jp": "Block No.",
@@ -2479,13 +2517,16 @@
                      }
                  },
                  "admin_level": {
                      }
                  },
                  "admin_level": {
-                    "label": "Admin Level"
+                    "label": "Admin Level",
+                    "terms": ""
                  },
                  "aerialway": {
                  },
                  "aerialway": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "aerialway/access": {
                      "label": "Access",
                  },
                  "aerialway/access": {
                      "label": "Access",
+                    "terms": "",
                      "options": {
                          "entry": "Entry",
                          "exit": "Exit",
                      "options": {
                          "entry": "Entry",
                          "exit": "Exit",
@@ -2493,25 +2534,31 @@
                      }
                  },
                  "aerialway/bubble": {
                      }
                  },
                  "aerialway/bubble": {
-                    "label": "Bubble"
+                    "label": "Bubble",
+                    "terms": ""
                  },
                  "aerialway/capacity": {
                      "label": "Capacity (per hour)",
                  },
                  "aerialway/capacity": {
                      "label": "Capacity (per hour)",
+                    "terms": "",
                      "placeholder": "500, 2500, 5000..."
                  },
                  "aerialway/duration": {
                      "label": "Duration (minutes)",
                      "placeholder": "500, 2500, 5000..."
                  },
                  "aerialway/duration": {
                      "label": "Duration (minutes)",
+                    "terms": "",
                      "placeholder": "1, 2, 3..."
                  },
                  "aerialway/heating": {
                      "placeholder": "1, 2, 3..."
                  },
                  "aerialway/heating": {
-                    "label": "Heated"
+                    "label": "Heated",
+                    "terms": ""
                  },
                  "aerialway/occupancy": {
                      "label": "Occupancy",
                  },
                  "aerialway/occupancy": {
                      "label": "Occupancy",
+                    "terms": "",
                      "placeholder": "2, 4, 8..."
                  },
                  "aerialway/summer/access": {
                      "label": "Access (summer)",
                      "placeholder": "2, 4, 8..."
                  },
                  "aerialway/summer/access": {
                      "label": "Access (summer)",
+                    "terms": "",
                      "options": {
                          "entry": "Entry",
                          "exit": "Exit",
                      "options": {
                          "entry": "Entry",
                          "exit": "Exit",
@@ -2519,64 +2566,84 @@
                      }
                  },
                  "aeroway": {
                      }
                  },
                  "aeroway": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "agrarian": {
                  },
                  "agrarian": {
-                    "label": "Products"
+                    "label": "Products",
+                    "terms": ""
                  },
                  "air_conditioning": {
                  },
                  "air_conditioning": {
-                    "label": "Air Conditioning"
+                    "label": "Air Conditioning",
+                    "terms": "cooling system,refrigeration"
                  },
                  "amenity": {
                  },
                  "amenity": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "animal_boarding": {
                  },
                  "animal_boarding": {
-                    "label": "For Animals"
+                    "label": "For Animals",
+                    "terms": ""
                  },
                  "animal_breeding": {
                  },
                  "animal_breeding": {
-                    "label": "For Animals"
+                    "label": "For Animals",
+                    "terms": ""
                  },
                  "animal_shelter": {
                  },
                  "animal_shelter": {
-                    "label": "For Animals"
+                    "label": "For Animals",
+                    "terms": ""
                  },
                  "architect": {
                  },
                  "architect": {
-                    "label": "Architect"
+                    "label": "Architect",
+                    "terms": "building designer"
                  },
                  "area/highway": {
                  },
                  "area/highway": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "artist": {
                  },
                  "artist": {
-                    "label": "Artist"
+                    "label": "Artist",
+                    "terms": ""
                  },
                  "artwork_type": {
                  },
                  "artwork_type": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "atm": {
                  },
                  "atm": {
-                    "label": "ATM"
+                    "label": "ATM",
+                    "terms": ""
                  },
                  "attraction": {
                  },
                  "attraction": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "backrest": {
                  },
                  "backrest": {
-                    "label": "Backrest"
+                    "label": "Backrest",
+                    "terms": ""
                  },
                  "bar": {
                  },
                  "bar": {
-                    "label": "Bar"
+                    "label": "Bar",
+                    "terms": ""
                  },
                  "barrier": {
                  },
                  "barrier": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "basin": {
                  },
                  "basin": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "bath/open_air": {
                  },
                  "bath/open_air": {
-                    "label": "Open Air"
+                    "label": "Open Air",
+                    "terms": ""
                  },
                  "bath/sand_bath": {
                  },
                  "bath/sand_bath": {
-                    "label": "Sand Bath"
+                    "label": "Sand Bath",
+                    "terms": ""
                  },
                  "bath/type": {
                      "label": "Specialty",
                  },
                  "bath/type": {
                      "label": "Specialty",
+                    "terms": "",
                      "options": {
                          "onsen": "Japanese Onsen",
                          "foot_bath": "Foot Bath",
                      "options": {
                          "onsen": "Japanese Onsen",
                          "foot_bath": "Foot Bath",
@@ -2584,19 +2651,24 @@
                      }
                  },
                  "beauty": {
                      }
                  },
                  "beauty": {
-                    "label": "Beauty Specialty"
+                    "label": "Beauty Specialty",
+                    "terms": ""
                  },
                  "bench": {
                  },
                  "bench": {
-                    "label": "Bench"
+                    "label": "Bench",
+                    "terms": "seating"
                  },
                  "bicycle_parking": {
                  },
                  "bicycle_parking": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "bin": {
                  },
                  "bin": {
-                    "label": "Waste Bin"
+                    "label": "Waste Bin",
+                    "terms": "garbage can,trash can"
                  },
                  "blood_components": {
                      "label": "Blood Components",
                  },
                  "blood_components": {
                      "label": "Blood Components",
+                    "terms": "",
                      "options": {
                          "whole": "whole blood",
                          "plasma": "plasma",
                      "options": {
                          "whole": "whole blood",
                          "plasma": "plasma",
@@ -2605,59 +2677,81 @@
                      }
                  },
                  "board_type": {
                      }
                  },
                  "board_type": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "booth": {
                  },
                  "booth": {
-                    "label": "Booth"
+                    "label": "Booth",
+                    "terms": ""
                  },
                  "boules": {
                  },
                  "boules": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "boundary": {
                  },
                  "boundary": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "brand": {
                  },
                  "brand": {
-                    "label": "Brand"
+                    "label": "Brand",
+                    "terms": ""
                  },
                  "brewery": {
                  },
                  "brewery": {
-                    "label": "Draft Beers"
+                    "label": "Draft Beers",
+                    "terms": "on tap"
                  },
                  "bridge": {
                      "label": "Type",
                  },
                  "bridge": {
                      "label": "Type",
+                    "terms": "",
                      "placeholder": "Default"
                  },
                  "bridge/support": {
                      "placeholder": "Default"
                  },
                  "bridge/support": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "building_area": {
                  },
                  "building_area": {
-                    "label": "Building"
+                    "label": "Building",
+                    "terms": ""
                  },
                  "building": {
                  },
                  "building": {
-                    "label": "Building"
+                    "label": "Building",
+                    "terms": "structure"
                  },
                  "building/levels_building": {
                      "label": "Building Levels",
                  },
                  "building/levels_building": {
                      "label": "Building Levels",
+                    "terms": "",
+                    "placeholder": "2, 4, 6..."
+                },
+                "building/levels/underground": {
+                    "label": "Underground Levels",
+                    "terms": "basement levels",
                      "placeholder": "2, 4, 6..."
                  },
                  "building/material": {
                      "placeholder": "2, 4, 6..."
                  },
                  "building/material": {
-                    "label": "Material"
+                    "label": "Material",
+                    "terms": ""
                  },
                  "bunker_type": {
                  },
                  "bunker_type": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "cables": {
                      "label": "Cables",
                  },
                  "cables": {
                      "label": "Cables",
+                    "terms": "",
                      "placeholder": "1, 2, 3..."
                  },
                  "camera/direction": {
                      "label": "Direction (Degrees Clockwise)",
                      "placeholder": "1, 2, 3..."
                  },
                  "camera/direction": {
                      "label": "Direction (Degrees Clockwise)",
+                    "terms": "",
                      "placeholder": "45, 90, 180, 270"
                  },
                  "camera/mount": {
                      "placeholder": "45, 90, 180, 270"
                  },
                  "camera/mount": {
-                    "label": "Camera Mount"
+                    "label": "Camera Mount",
+                    "terms": ""
                  },
                  "camera/type": {
                      "label": "Camera Type",
                  },
                  "camera/type": {
                      "label": "Camera Type",
+                    "terms": "",
                      "options": {
                          "fixed": "Fixed",
                          "panning": "Panning",
                      "options": {
                          "fixed": "Fixed",
                          "panning": "Panning",
@@ -2666,51 +2760,80 @@
                  },
                  "capacity": {
                      "label": "Capacity",
                  },
                  "capacity": {
                      "label": "Capacity",
+                    "terms": "",
                      "placeholder": "50, 100, 200..."
                  },
                  "cash_in": {
                      "placeholder": "50, 100, 200..."
                  },
                  "cash_in": {
-                    "label": "Cash In"
+                    "label": "Cash In",
+                    "terms": ""
                  },
                  "castle_type": {
                  },
                  "castle_type": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
+                },
+                "changing_table": {
+                    "label": "Diaper Changing Table",
+                    "terms": ""
+                },
+                "charge_fee": {
+                    "label": "Fee Amount",
+                    "terms": "",
+                    "placeholder": "1 EUR, 5 USD, 10 JPY…"
+                },
+                "charge_toll": {
+                    "label": "Toll Amount",
+                    "terms": "",
+                    "placeholder": "1 EUR, 5 USD, 10 JPY…"
                  },
                  "check_date": {
                  },
                  "check_date": {
-                    "label": "Last Checked Date"
+                    "label": "Last Checked Date",
+                    "terms": ""
                  },
                  "clothes": {
                  },
                  "clothes": {
-                    "label": "Clothes"
+                    "label": "Clothes",
+                    "terms": ""
                  },
                  "club": {
                  },
                  "club": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "collection_times": {
                  },
                  "collection_times": {
-                    "label": "Collection Times"
+                    "label": "Collection Times",
+                    "terms": ""
                  },
                  "colour": {
                  },
                  "colour": {
-                    "label": "Color"
+                    "label": "Color",
+                    "terms": ""
                  },
                  "comment": {
                      "label": "Changeset Comment",
                  },
                  "comment": {
                      "label": "Changeset Comment",
+                    "terms": "",
                      "placeholder": "Brief description of your contributions (required)"
                  },
                  "communication_multi": {
                      "placeholder": "Brief description of your contributions (required)"
                  },
                  "communication_multi": {
-                    "label": "Communication Types"
+                    "label": "Communication Types",
+                    "terms": ""
                  },
                  "construction": {
                  },
                  "construction": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "consulate": {
                  },
                  "consulate": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "contact/webcam": {
                      "label": "Webcam URL",
                  },
                  "contact/webcam": {
                      "label": "Webcam URL",
+                    "terms": "",
                      "placeholder": "http://example.com/"
                  },
                  "content": {
                      "placeholder": "http://example.com/"
                  },
                  "content": {
-                    "label": "Content"
+                    "label": "Content",
+                    "terms": ""
                  },
                  "conveying": {
                      "label": "Movement Direction",
                  },
                  "conveying": {
                      "label": "Movement Direction",
+                    "terms": "",
                      "options": {
                          "forward": "Forward",
                          "backward": "Backward",
                      "options": {
                          "forward": "Forward",
                          "backward": "Backward",
@@ -2718,20 +2841,25 @@
                      }
                  },
                  "country": {
                      }
                  },
                  "country": {
-                    "label": "Country"
+                    "label": "Country",
+                    "terms": ""
                  },
                  "couplings": {
                      "label": "Couplings",
                  },
                  "couplings": {
                      "label": "Couplings",
+                    "terms": "",
                      "placeholder": "1, 2, 3..."
                  },
                  "covered": {
                      "placeholder": "1, 2, 3..."
                  },
                  "covered": {
-                    "label": "Covered"
+                    "label": "Covered",
+                    "terms": ""
                  },
                  "craft": {
                  },
                  "craft": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "crane/type": {
                      "label": "Crane Type",
                  },
                  "crane/type": {
                      "label": "Crane Type",
+                    "terms": "",
                      "options": {
                          "portal_crane": "Portal Crane",
                          "floor-mounted_crane": "Floor-mounted Crane",
                      "options": {
                          "portal_crane": "Portal Crane",
                          "floor-mounted_crane": "Floor-mounted Crane",
@@ -2739,26 +2867,37 @@
                      }
                  },
                  "crop": {
                      }
                  },
                  "crop": {
-                    "label": "Crops"
+                    "label": "Crops",
+                    "terms": ""
                  },
                  "crossing": {
                  },
                  "crossing": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
+                },
+                "crossing/island": {
+                    "label": "Refuge Island",
+                    "terms": ""
                  },
                  "cuisine": {
                  },
                  "cuisine": {
-                    "label": "Cuisines"
+                    "label": "Cuisines",
+                    "terms": ""
                  },
                  "currency_multi": {
                  },
                  "currency_multi": {
-                    "label": "Currency Types"
+                    "label": "Currency Types",
+                    "terms": "bills,cash,coins,money"
                  },
                  "cutting": {
                      "label": "Type",
                  },
                  "cutting": {
                      "label": "Type",
+                    "terms": "",
                      "placeholder": "Default"
                  },
                  "cycle_network": {
                      "placeholder": "Default"
                  },
                  "cycle_network": {
-                    "label": "Network"
+                    "label": "Network",
+                    "terms": ""
                  },
                  "cycleway": {
                      "label": "Bike Lanes",
                  },
                  "cycleway": {
                      "label": "Bike Lanes",
+                    "terms": "",
                      "placeholder": "none",
                      "types": {
                          "cycleway:left": "Left side",
                      "placeholder": "none",
                      "types": {
                          "cycleway:left": "Left side",
@@ -2796,22 +2935,28 @@
                      }
                  },
                  "dance/style": {
                      }
                  },
                  "dance/style": {
-                    "label": "Dance Styles"
+                    "label": "Dance Styles",
+                    "terms": ""
                  },
                  "date": {
                  },
                  "date": {
-                    "label": "Date"
+                    "label": "Date",
+                    "terms": ""
                  },
                  "delivery": {
                  },
                  "delivery": {
-                    "label": "Delivery"
+                    "label": "Delivery",
+                    "terms": ""
                  },
                  "denomination": {
                  },
                  "denomination": {
-                    "label": "Denomination"
+                    "label": "Denomination",
+                    "terms": ""
                  },
                  "denotation": {
                  },
                  "denotation": {
-                    "label": "Denotation"
+                    "label": "Denotation",
+                    "terms": ""
                  },
                  "departures_board": {
                      "label": "Departures Board",
                  },
                  "departures_board": {
                      "label": "Departures Board",
+                    "terms": "",
                      "options": {
                          "yes": "Yes",
                          "timetable": "Timetable",
                      "options": {
                          "yes": "Yes",
                          "timetable": "Timetable",
@@ -2820,38 +2965,50 @@
                      }
                  },
                  "description": {
                      }
                  },
                  "description": {
-                    "label": "Description"
+                    "label": "Description",
+                    "terms": "summary"
                  },
                  "design": {
                  },
                  "design": {
-                    "label": "Design"
+                    "label": "Design",
+                    "terms": ""
                  },
                  "destination_oneway": {
                  },
                  "destination_oneway": {
-                    "label": "Destinations"
+                    "label": "Destinations",
+                    "terms": ""
                  },
                  "destination/ref_oneway": {
                  },
                  "destination/ref_oneway": {
-                    "label": "Destination Road Numbers"
+                    "label": "Destination Road Numbers",
+                    "terms": ""
                  },
                  "destination/symbol_oneway": {
                  },
                  "destination/symbol_oneway": {
-                    "label": "Destination Symbols"
+                    "label": "Destination Symbols",
+                    "terms": ""
                  },
                  "devices": {
                      "label": "Devices",
                  },
                  "devices": {
                      "label": "Devices",
+                    "terms": "",
                      "placeholder": "1, 2, 3..."
                  },
                      "placeholder": "1, 2, 3..."
                  },
-                "diaper": {
-                    "label": "Diaper Changing Available"
+                "diameter": {
+                    "label": "Diameter",
+                    "terms": "",
+                    "placeholder": "5 mm, 10 cm, 15 in…"
                  },
                  "diet_multi": {
                  },
                  "diet_multi": {
-                    "label": "Diet Types"
+                    "label": "Diet Types",
+                    "terms": "gluten free,fruitarian,halal,kosher,lactose free,meat,pescatarian,raw,vegan,vegetarian"
                  },
                  "diplomatic": {
                  },
                  "diplomatic": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "diplomatic/services": {
                  },
                  "diplomatic/services": {
-                    "label": "Services"
+                    "label": "Services",
+                    "terms": ""
                  },
                  "direction_cardinal": {
                      "label": "Direction",
                  },
                  "direction_cardinal": {
                      "label": "Direction",
+                    "terms": "",
                      "options": {
                          "N": "North",
                          "E": "East",
                      "options": {
                          "N": "North",
                          "E": "East",
@@ -2873,13 +3030,15 @@
                  },
                  "direction_clock": {
                      "label": "Direction",
                  },
                  "direction_clock": {
                      "label": "Direction",
+                    "terms": "",
                      "options": {
                          "clockwise": "Clockwise",
                          "anticlockwise": "Counterclockwise"
                      }
                  },
                  "direction_vertex": {
                      "options": {
                          "clockwise": "Clockwise",
                          "anticlockwise": "Counterclockwise"
                      }
                  },
                  "direction_vertex": {
-                    "label": "Direction",
+                    "label": "Direction Affected",
+                    "terms": "",
                      "options": {
                          "forward": "Forward",
                          "backward": "Backward",
                      "options": {
                          "forward": "Forward",
                          "backward": "Backward",
@@ -2888,22 +3047,28 @@
                  },
                  "direction": {
                      "label": "Direction (Degrees Clockwise)",
                  },
                  "direction": {
                      "label": "Direction (Degrees Clockwise)",
+                    "terms": "",
                      "placeholder": "45, 90, 180, 270"
                  },
                  "dispensing": {
                      "placeholder": "45, 90, 180, 270"
                  },
                  "dispensing": {
-                    "label": "Dispenses Prescriptions"
+                    "label": "Dispenses Prescriptions",
+                    "terms": ""
                  },
                  "display": {
                  },
                  "display": {
-                    "label": "Display"
+                    "label": "Display",
+                    "terms": ""
                  },
                  "distance": {
                  },
                  "distance": {
-                    "label": "Distance"
+                    "label": "Distance",
+                    "terms": ""
                  },
                  "dock": {
                  },
                  "dock": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "dog": {
                      "label": "Dogs",
                  },
                  "dog": {
                      "label": "Dogs",
+                    "terms": "animals,pets",
                      "options": {
                          "yes": "Allowed",
                          "leashed": "Leashed Only",
                      "options": {
                          "yes": "Allowed",
                          "leashed": "Leashed Only",
@@ -2911,20 +3076,25 @@
                      }
                  },
                  "door_type": {
                      }
                  },
                  "door_type": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "door": {
                  },
                  "door": {
-                    "label": "Door"
+                    "label": "Door",
+                    "terms": ""
                  },
                  "drive_through": {
                  },
                  "drive_through": {
-                    "label": "Drive-Through"
+                    "label": "Drive-Through",
+                    "terms": ""
                  },
                  "duration": {
                      "label": "Duration",
                  },
                  "duration": {
                      "label": "Duration",
+                    "terms": "",
                      "placeholder": "00:00"
                  },
                  "electrified": {
                      "label": "Electrification",
                      "placeholder": "00:00"
                  },
                  "electrified": {
                      "label": "Electrification",
+                    "terms": "",
                      "placeholder": "Contact Line, Electrified Rail...",
                      "options": {
                          "contact_line": "Contact Line",
                      "placeholder": "Contact Line, Electrified Rail...",
                      "options": {
                          "contact_line": "Contact Line",
@@ -2934,55 +3104,71 @@
                      }
                  },
                  "elevation": {
                      }
                  },
                  "elevation": {
-                    "label": "Elevation"
+                    "label": "Elevation",
+                    "terms": "altitude"
                  },
                  "email": {
                      "label": "Email",
                  },
                  "email": {
                      "label": "Email",
+                    "terms": "",
                      "placeholder": "example@example.com"
                  },
                  "embankment": {
                      "label": "Type",
                      "placeholder": "example@example.com"
                  },
                  "embankment": {
                      "label": "Type",
+                    "terms": "",
                      "placeholder": "Default"
                  },
                  "embassy": {
                      "placeholder": "Default"
                  },
                  "embassy": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "emergency_combo": {
                  },
                  "emergency_combo": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "emergency": {
                  },
                  "emergency": {
-                    "label": "Emergency"
+                    "label": "Emergency",
+                    "terms": ""
                  },
                  "enforcement": {
                  },
                  "enforcement": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "entrance": {
                  },
                  "entrance": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "except": {
                  },
                  "except": {
-                    "label": "Exceptions"
+                    "label": "Exceptions",
+                    "terms": ""
                  },
                  "faces": {
                  },
                  "faces": {
-                    "label": "Faces"
+                    "label": "Faces",
+                    "terms": ""
                  },
                  "fax": {
                      "label": "Fax",
                  },
                  "fax": {
                      "label": "Fax",
+                    "terms": "",
                      "placeholder": "+31 42 123 4567"
                  },
                  "fee": {
                      "placeholder": "+31 42 123 4567"
                  },
                  "fee": {
-                    "label": "Fee"
+                    "label": "Fee",
+                    "terms": ""
                  },
                  "fence_type": {
                  },
                  "fence_type": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "fire_hydrant/diameter": {
                  },
                  "fire_hydrant/diameter": {
-                    "label": "Diameter (mm, in, or letters)"
+                    "label": "Diameter (mm, in, or letters)",
+                    "terms": ""
                  },
                  "fire_hydrant/pressure": {
                  },
                  "fire_hydrant/pressure": {
-                    "label": "Pressure (bar)"
+                    "label": "Pressure (bar)",
+                    "terms": ""
                  },
                  "fire_hydrant/type": {
                      "label": "Shape",
                  },
                  "fire_hydrant/type": {
                      "label": "Shape",
+                    "terms": "",
                      "options": {
                          "pillar": "Pillar/Aboveground",
                          "underground": "Underground",
                      "options": {
                          "pillar": "Pillar/Aboveground",
                          "underground": "Underground",
@@ -2991,50 +3177,65 @@
                      }
                  },
                  "fireplace": {
                      }
                  },
                  "fireplace": {
-                    "label": "Fireplace"
+                    "label": "Fireplace",
+                    "terms": ""
                  },
                  "fishing": {
                  },
                  "fishing": {
-                    "label": "Fishing"
+                    "label": "Fishing",
+                    "terms": ""
                  },
                  "fitness_station": {
                  },
                  "fitness_station": {
-                    "label": "Equipment Type"
+                    "label": "Equipment Type",
+                    "terms": ""
                  },
                  "fixme": {
                  },
                  "fixme": {
-                    "label": "Fix Me"
+                    "label": "Fix Me",
+                    "terms": "help request"
                  },
                  "flag/type": {
                  },
                  "flag/type": {
-                    "label": "Flag Type"
+                    "label": "Flag Type",
+                    "terms": ""
                  },
                  "floating": {
                  },
                  "floating": {
-                    "label": "Floating"
+                    "label": "Floating",
+                    "terms": ""
                  },
                  "flood_prone": {
                  },
                  "flood_prone": {
-                    "label": "Flood Prone"
+                    "label": "Flood Prone",
+                    "terms": ""
                  },
                  "ford": {
                      "label": "Type",
                  },
                  "ford": {
                      "label": "Type",
+                    "terms": "",
                      "placeholder": "Default"
                  },
                  "frequency_electrified": {
                      "placeholder": "Default"
                  },
                  "frequency_electrified": {
-                    "label": "Operating Frequency"
+                    "label": "Operating Frequency",
+                    "terms": ""
                  },
                  "frequency": {
                  },
                  "frequency": {
-                    "label": "Operating Frequency"
+                    "label": "Operating Frequency",
+                    "terms": ""
                  },
                  "from": {
                  },
                  "from": {
-                    "label": "From"
+                    "label": "From",
+                    "terms": ""
                  },
                  "fuel_multi": {
                  },
                  "fuel_multi": {
-                    "label": "Fuel Types"
+                    "label": "Fuel Types",
+                    "terms": ""
                  },
                  "fuel": {
                  },
                  "fuel": {
-                    "label": "Fuel"
+                    "label": "Fuel",
+                    "terms": ""
                  },
                  "gauge": {
                  },
                  "gauge": {
-                    "label": "Gauge"
+                    "label": "Gauge",
+                    "terms": ""
                  },
                  "gender": {
                      "label": "Gender",
                  },
                  "gender": {
                      "label": "Gender",
+                    "terms": "access,female,male,unisex",
                      "placeholder": "Unknown",
                      "options": {
                          "male": "Male",
                      "placeholder": "Unknown",
                      "options": {
                          "male": "Male",
@@ -3043,77 +3244,100 @@
                      }
                  },
                  "generator/method": {
                      }
                  },
                  "generator/method": {
-                    "label": "Method"
+                    "label": "Method",
+                    "terms": ""
                  },
                  "generator/output/electricity": {
                      "label": "Power Output",
                  },
                  "generator/output/electricity": {
                      "label": "Power Output",
+                    "terms": "",
                      "placeholder": "50 MW, 100 MW, 200 MW..."
                  },
                  "generator/source": {
                      "placeholder": "50 MW, 100 MW, 200 MW..."
                  },
                  "generator/source": {
-                    "label": "Source"
+                    "label": "Source",
+                    "terms": ""
                  },
                  "generator/type": {
                  },
                  "generator/type": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "government": {
                  },
                  "government": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "grape_variety": {
                  },
                  "grape_variety": {
-                    "label": "Grape Varieties"
+                    "label": "Grape Varieties",
+                    "terms": ""
                  },
                  "guest_house": {
                  },
                  "guest_house": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "handicap": {
                      "label": "Handicap",
                  },
                  "handicap": {
                      "label": "Handicap",
+                    "terms": "",
                      "placeholder": "1-18"
                  },
                  "handrail": {
                      "placeholder": "1-18"
                  },
                  "handrail": {
-                    "label": "Handrail"
+                    "label": "Handrail",
+                    "terms": ""
                  },
                  "hashtags": {
                      "label": "Suggested Hashtags",
                  },
                  "hashtags": {
                      "label": "Suggested Hashtags",
+                    "terms": "",
                      "placeholder": "#example"
                  },
                  "healthcare": {
                      "placeholder": "#example"
                  },
                  "healthcare": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "healthcare/speciality": {
                  },
                  "healthcare/speciality": {
-                    "label": "Specialties"
+                    "label": "Specialties",
+                    "terms": ""
                  },
                  "height_building": {
                  },
                  "height_building": {
-                    "label": "Building Height (Meters)"
+                    "label": "Building Height (Meters)",
+                    "terms": ""
                  },
                  "height": {
                  },
                  "height": {
-                    "label": "Height (Meters)"
+                    "label": "Height (Meters)",
+                    "terms": ""
                  },
                  "highspeed": {
                  },
                  "highspeed": {
-                    "label": "High-Speed"
+                    "label": "High-Speed",
+                    "terms": ""
                  },
                  "highway": {
                  },
                  "highway": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "historic": {
                  },
                  "historic": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "historic/civilization": {
                  },
                  "historic/civilization": {
-                    "label": "Historic Civilization"
+                    "label": "Historic Civilization",
+                    "terms": ""
                  },
                  "historic/wreck/date_sunk": {
                  },
                  "historic/wreck/date_sunk": {
-                    "label": "Date Sunk"
+                    "label": "Date Sunk",
+                    "terms": ""
                  },
                  "historic/wreck/visible_at_high_tide": {
                  },
                  "historic/wreck/visible_at_high_tide": {
-                    "label": "Visible At High Tide"
+                    "label": "Visible At High Tide",
+                    "terms": ""
                  },
                  "historic/wreck/visible_at_low_tide": {
                  },
                  "historic/wreck/visible_at_low_tide": {
-                    "label": "Visible At Low Tide"
+                    "label": "Visible At Low Tide",
+                    "terms": ""
                  },
                  "hoops": {
                      "label": "Hoops",
                  },
                  "hoops": {
                      "label": "Hoops",
+                    "terms": "",
                      "placeholder": "1, 2, 4..."
                  },
                  "horse_dressage": {
                      "label": "Dressage Riding",
                      "placeholder": "1, 2, 4..."
                  },
                  "horse_dressage": {
                      "label": "Dressage Riding",
+                    "terms": "",
                      "options": {
                          "undefined": "No",
                          "equestrian": "Yes"
                      "options": {
                          "undefined": "No",
                          "equestrian": "Yes"
@@ -3121,6 +3345,7 @@
                  },
                  "horse_riding": {
                      "label": "Horseback Riding",
                  },
                  "horse_riding": {
                      "label": "Horseback Riding",
+                    "terms": "",
                      "options": {
                          "undefined": "No",
                          "horse_riding": "Yes"
                      "options": {
                          "undefined": "No",
                          "horse_riding": "Yes"
@@ -3128,6 +3353,7 @@
                  },
                  "horse_scale": {
                      "label": "Horseback Riding Difficulty",
                  },
                  "horse_scale": {
                      "label": "Horseback Riding Difficulty",
+                    "terms": "",
                      "placeholder": "Difficult, Dangerous...",
                      "options": {
                          "common": "Easy: No problems or difficulties. (default)",
                      "placeholder": "Difficult, Dangerous...",
                      "options": {
                          "common": "Easy: No problems or difficulties. (default)",
@@ -3140,50 +3366,63 @@
                  },
                  "horse_stables": {
                      "label": "Riding Stable",
                  },
                  "horse_stables": {
                      "label": "Riding Stable",
+                    "terms": "",
                      "options": {
                          "undefined": "No",
                          "stables": "Yes"
                      }
                  },
                  "iata": {
                      "options": {
                          "undefined": "No",
                          "stables": "Yes"
                      }
                  },
                  "iata": {
-                    "label": "IATA"
+                    "label": "IATA Airport Code",
+                    "terms": ""
                  },
                  "icao": {
                  },
                  "icao": {
-                    "label": "ICAO"
+                    "label": "ICAO Airport Code",
+                    "terms": ""
                  },
                  "incline_steps": {
                      "label": "Incline",
                  },
                  "incline_steps": {
                      "label": "Incline",
+                    "terms": "",
                      "options": {
                          "up": "Up",
                          "down": "Down"
                      }
                  },
                  "incline": {
                      "options": {
                          "up": "Up",
                          "down": "Down"
                      }
                  },
                  "incline": {
-                    "label": "Incline"
+                    "label": "Incline",
+                    "terms": ""
                  },
                  "indoor_type": {
                  },
                  "indoor_type": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "indoor": {
                  },
                  "indoor": {
-                    "label": "Indoor"
+                    "label": "Indoor",
+                    "terms": ""
                  },
                  "industrial": {
                  },
                  "industrial": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "information": {
                  },
                  "information": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "inscription": {
                  },
                  "inscription": {
-                    "label": "Inscription"
+                    "label": "Inscription",
+                    "terms": ""
                  },
                  "intermittent_yes": {
                  },
                  "intermittent_yes": {
-                    "label": "Intermittent"
+                    "label": "Intermittent",
+                    "terms": ""
                  },
                  "intermittent": {
                  },
                  "intermittent": {
-                    "label": "Intermittent"
+                    "label": "Intermittent",
+                    "terms": ""
                  },
                  "internet_access": {
                      "label": "Internet Access",
                  },
                  "internet_access": {
                      "label": "Internet Access",
+                    "terms": "wifi,wlan",
                      "options": {
                          "yes": "Yes",
                          "no": "No",
                      "options": {
                          "yes": "Yes",
                          "no": "No",
@@ -3193,16 +3432,20 @@
                      }
                  },
                  "internet_access/fee": {
                      }
                  },
                  "internet_access/fee": {
-                    "label": "Internet Access Fee"
+                    "label": "Internet Access Fee",
+                    "terms": "wifi fee"
                  },
                  "internet_access/ssid": {
                  },
                  "internet_access/ssid": {
-                    "label": "Wifi Network Name"
+                    "label": "Wifi Network Name",
+                    "terms": "ssid"
                  },
                  "interval": {
                  },
                  "interval": {
-                    "label": "Interval"
+                    "label": "Interval",
+                    "terms": ""
                  },
                  "junction_line": {
                      "label": "Junction",
                  },
                  "junction_line": {
                      "label": "Junction",
+                    "terms": "",
                      "options": {
                          "roundabout": "Roundabout",
                          "circular": "Traffic Circle",
                      "options": {
                          "roundabout": "Roundabout",
                          "circular": "Traffic Circle",
@@ -3210,36 +3453,46 @@
                      }
                  },
                  "junction/ref_oneway": {
                      }
                  },
                  "junction/ref_oneway": {
-                    "label": "Junction Number"
+                    "label": "Junction Number",
+                    "terms": ""
                  },
                  "kerb": {
                  },
                  "kerb": {
-                    "label": "Curb"
+                    "label": "Curb",
+                    "terms": ""
                  },
                  "kerb/height": {
                  },
                  "kerb/height": {
-                    "label": "Height"
+                    "label": "Height",
+                    "terms": ""
                  },
                  "label": {
                  },
                  "label": {
-                    "label": "Label"
+                    "label": "Label",
+                    "terms": ""
                  },
                  "lamp_type": {
                  },
                  "lamp_type": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "landuse": {
                  },
                  "landuse": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "lanes": {
                      "label": "Lanes",
                  },
                  "lanes": {
                      "label": "Lanes",
+                    "terms": "",
                      "placeholder": "1, 2, 3..."
                  },
                  "language_multi": {
                      "placeholder": "1, 2, 3..."
                  },
                  "language_multi": {
-                    "label": "Languages"
+                    "label": "Languages",
+                    "terms": ""
                  },
                  "layer": {
                      "label": "Layer",
                  },
                  "layer": {
                      "label": "Layer",
+                    "terms": "",
                      "placeholder": "0"
                  },
                  "leaf_cycle_singular": {
                      "label": "Leaf Cycle",
                      "placeholder": "0"
                  },
                  "leaf_cycle_singular": {
                      "label": "Leaf Cycle",
+                    "terms": "",
                      "options": {
                          "evergreen": "Evergreen",
                          "deciduous": "Deciduous",
                      "options": {
                          "evergreen": "Evergreen",
                          "deciduous": "Deciduous",
@@ -3249,6 +3502,7 @@
                  },
                  "leaf_cycle": {
                      "label": "Leaf Cycle",
                  },
                  "leaf_cycle": {
                      "label": "Leaf Cycle",
+                    "terms": "",
                      "options": {
                          "evergreen": "Evergreen",
                          "deciduous": "Deciduous",
                      "options": {
                          "evergreen": "Evergreen",
                          "deciduous": "Deciduous",
@@ -3259,6 +3513,7 @@
                  },
                  "leaf_type_singular": {
                      "label": "Leaf Type",
                  },
                  "leaf_type_singular": {
                      "label": "Leaf Type",
+                    "terms": "",
                      "options": {
                          "broadleaved": "Broadleaved",
                          "needleleaved": "Needleleaved",
                      "options": {
                          "broadleaved": "Broadleaved",
                          "needleleaved": "Needleleaved",
@@ -3267,6 +3522,7 @@
                  },
                  "leaf_type": {
                      "label": "Leaf Type",
                  },
                  "leaf_type": {
                      "label": "Leaf Type",
+                    "terms": "",
                      "options": {
                          "broadleaved": "Broadleaved",
                          "needleleaved": "Needleleaved",
                      "options": {
                          "broadleaved": "Broadleaved",
                          "needleleaved": "Needleleaved",
@@ -3275,26 +3531,37 @@
                      }
                  },
                  "leisure": {
                      }
                  },
                  "leisure": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "length": {
                  },
                  "length": {
-                    "label": "Length (Meters)"
+                    "label": "Length (Meters)",
+                    "terms": ""
                  },
                  "level": {
                  },
                  "level": {
-                    "label": "Level"
+                    "label": "Level",
+                    "terms": "building floor,deck,storey,story"
                  },
                  "levels": {
                      "label": "Levels",
                  },
                  "levels": {
                      "label": "Levels",
+                    "terms": "",
                      "placeholder": "2, 4, 6..."
                  },
                  "liaison": {
                      "placeholder": "2, 4, 6..."
                  },
                  "liaison": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
+                },
+                "line_attachment": {
+                    "label": "Line Attachment",
+                    "terms": ""
                  },
                  "lit": {
                  },
                  "lit": {
-                    "label": "Lit"
+                    "label": "Lit",
+                    "terms": "lamp,lighting"
                  },
                  "location_pool": {
                      "label": "Location",
                  },
                  "location_pool": {
                      "label": "Location",
+                    "terms": "",
                      "options": {
                          "outdoor": "Outdoor",
                          "indoor": "Indoor",
                      "options": {
                          "outdoor": "Outdoor",
                          "indoor": "Indoor",
@@ -3302,65 +3569,84 @@
                      }
                  },
                  "location": {
                      }
                  },
                  "location": {
-                    "label": "Location"
+                    "label": "Location",
+                    "terms": ""
                  },
                  "lock": {
                  },
                  "lock": {
-                    "label": "Lock"
+                    "label": "Lock",
+                    "terms": ""
                  },
                  "man_made": {
                  },
                  "man_made": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "manhole": {
                  },
                  "manhole": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "manufacturer": {
                  },
                  "manufacturer": {
-                    "label": "Manufacturer"
+                    "label": "Manufacturer",
+                    "terms": ""
                  },
                  "map_size": {
                  },
                  "map_size": {
-                    "label": "Coverage"
+                    "label": "Coverage",
+                    "terms": ""
                  },
                  "map_type": {
                  },
                  "map_type": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "material": {
                  },
                  "material": {
-                    "label": "Material"
+                    "label": "Material",
+                    "terms": ""
                  },
                  "maxheight": {
                      "label": "Max Height",
                  },
                  "maxheight": {
                      "label": "Max Height",
+                    "terms": "",
                      "placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\""
                  },
                  "maxspeed": {
                      "label": "Speed Limit",
                      "placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\""
                  },
                  "maxspeed": {
                      "label": "Speed Limit",
+                    "terms": "",
                      "placeholder": "40, 50, 60..."
                  },
                  "maxspeed/advisory": {
                      "label": "Advisory Speed Limit",
                      "placeholder": "40, 50, 60..."
                  },
                  "maxspeed/advisory": {
                      "label": "Advisory Speed Limit",
+                    "terms": "",
                      "placeholder": "40, 50, 60..."
                  },
                  "maxstay": {
                      "placeholder": "40, 50, 60..."
                  },
                  "maxstay": {
-                    "label": "Max Stay"
+                    "label": "Max Stay",
+                    "terms": ""
                  },
                  "maxweight_bridge": {
                  },
                  "maxweight_bridge": {
-                    "label": "Max Weight"
+                    "label": "Max Weight",
+                    "terms": ""
                  },
                  "maxweight": {
                  },
                  "maxweight": {
-                    "label": "Max Weight"
+                    "label": "Max Weight",
+                    "terms": ""
                  },
                  "memorial": {
                  },
                  "memorial": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "microbrewery": {
                  },
                  "microbrewery": {
-                    "label": "Microbrewery"
+                    "label": "Microbrewery",
+                    "terms": "brewpub,craft beer"
                  },
                  "minspeed": {
                      "label": "Minimum Speed Limit",
                  },
                  "minspeed": {
                      "label": "Minimum Speed Limit",
+                    "terms": "",
                      "placeholder": "20, 30, 40..."
                  },
                  "monitoring_multi": {
                      "placeholder": "20, 30, 40..."
                  },
                  "monitoring_multi": {
-                    "label": "Monitoring"
+                    "label": "Monitoring",
+                    "terms": ""
                  },
                  "mtb/scale": {
                      "label": "Mountain Biking Difficulty",
                  },
                  "mtb/scale": {
                      "label": "Mountain Biking Difficulty",
+                    "terms": "",
                      "placeholder": "0, 1, 2, 3...",
                      "options": {
                          "0": "0: Solid gravel/packed earth, no obstacles, wide curves",
                      "placeholder": "0, 1, 2, 3...",
                      "options": {
                          "0": "0: Solid gravel/packed earth, no obstacles, wide curves",
@@ -3374,6 +3660,7 @@
                  },
                  "mtb/scale/imba": {
                      "label": "IMBA Trail Difficulty",
                  },
                  "mtb/scale/imba": {
                      "label": "IMBA Trail Difficulty",
+                    "terms": "",
                      "placeholder": "Easy, Medium, Difficult...",
                      "options": {
                          "0": "Easiest (white circle)",
                      "placeholder": "Easy, Medium, Difficult...",
                      "options": {
                          "0": "Easiest (white circle)",
@@ -3385,6 +3672,7 @@
                  },
                  "mtb/scale/uphill": {
                      "label": "Mountain Biking Uphill Difficulty",
                  },
                  "mtb/scale/uphill": {
                      "label": "Mountain Biking Uphill Difficulty",
+                    "terms": "",
                      "placeholder": "0, 1, 2, 3...",
                      "options": {
                          "0": "0: Avg. incline <10%, gravel/packed earth, no obstacles",
                      "placeholder": "0, 1, 2, 3...",
                      "options": {
                          "0": "0: Avg. incline <10%, gravel/packed earth, no obstacles",
@@ -3397,13 +3685,16 @@
                  },
                  "name": {
                      "label": "Name",
                  },
                  "name": {
                      "label": "Name",
+                    "terms": "label,title",
                      "placeholder": "Common name (if any)"
                  },
                  "natural": {
                      "placeholder": "Common name (if any)"
                  },
                  "natural": {
-                    "label": "Natural"
+                    "label": "Natural",
+                    "terms": ""
                  },
                  "network_bicycle": {
                      "label": "Network Type",
                  },
                  "network_bicycle": {
                      "label": "Network Type",
+                    "terms": "",
                      "placeholder": "Local, Regional, National, International",
                      "options": {
                          "lcn": "Local",
                      "placeholder": "Local, Regional, National, International",
                      "options": {
                          "lcn": "Local",
@@ -3414,6 +3705,7 @@
                  },
                  "network_foot": {
                      "label": "Network Type",
                  },
                  "network_foot": {
                      "label": "Network Type",
+                    "terms": "",
                      "placeholder": "Local, Regional, National, International",
                      "options": {
                          "lwn": "Local",
                      "placeholder": "Local, Regional, National, International",
                      "options": {
                          "lwn": "Local",
@@ -3424,6 +3716,7 @@
                  },
                  "network_horse": {
                      "label": "Network Type",
                  },
                  "network_horse": {
                      "label": "Network Type",
+                    "terms": "",
                      "placeholder": "Local, Regional, National, International",
                      "options": {
                          "lhn": "Local",
                      "placeholder": "Local, Regional, National, International",
                      "options": {
                          "lhn": "Local",
@@ -3433,19 +3726,28 @@
                      }
                  },
                  "network_road": {
                      }
                  },
                  "network_road": {
-                    "label": "Network"
+                    "label": "Network",
+                    "terms": ""
                  },
                  "network": {
                  },
                  "network": {
-                    "label": "Network"
+                    "label": "Network",
+                    "terms": ""
+                },
+                "not/name": {
+                    "label": "Incorrect Names",
+                    "terms": "common mistake names,wrong names"
                  },
                  "note": {
                  },
                  "note": {
-                    "label": "Note"
+                    "label": "Note",
+                    "terms": "comment"
                  },
                  "office": {
                  },
                  "office": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "oneway_yes": {
                      "label": "One Way",
                  },
                  "oneway_yes": {
                      "label": "One Way",
+                    "terms": "",
                      "options": {
                          "undefined": "Assumed to be Yes",
                          "yes": "Yes",
                      "options": {
                          "undefined": "Assumed to be Yes",
                          "yes": "Yes",
@@ -3456,6 +3758,7 @@
                  },
                  "oneway": {
                      "label": "One Way",
                  },
                  "oneway": {
                      "label": "One Way",
+                    "terms": "",
                      "options": {
                          "undefined": "Assumed to be No",
                          "yes": "Yes",
                      "options": {
                          "undefined": "Assumed to be No",
                          "yes": "Yes",
@@ -3465,30 +3768,42 @@
                      }
                  },
                  "oneway/bicycle": {
                      }
                  },
                  "oneway/bicycle": {
-                    "label": "One Way (Bicycles)"
+                    "label": "One Way (Bicycles)",
+                    "terms": ""
                  },
                  "opening_date": {
                  },
                  "opening_date": {
-                    "label": "Expected Opening Date"
+                    "label": "Expected Opening Date",
+                    "terms": ""
                  },
                  "opening_hours": {
                      "label": "Hours",
                  },
                  "opening_hours": {
                      "label": "Hours",
+                    "terms": "",
                      "placeholder": "Unknown"
                  },
                  "operator": {
                      "placeholder": "Unknown"
                  },
                  "operator": {
-                    "label": "Operator"
+                    "label": "Operator",
+                    "terms": ""
+                },
+                "operator/type": {
+                    "label": "Operator Type",
+                    "terms": ""
                  },
                  "outdoor_seating": {
                  },
                  "outdoor_seating": {
-                    "label": "Outdoor Seating"
+                    "label": "Outdoor Seating",
+                    "terms": ""
                  },
                  "par": {
                      "label": "Par",
                  },
                  "par": {
                      "label": "Par",
+                    "terms": "",
                      "placeholder": "3, 4, 5..."
                  },
                  "park_ride": {
                      "placeholder": "3, 4, 5..."
                  },
                  "park_ride": {
-                    "label": "Park and Ride"
+                    "label": "Park and Ride",
+                    "terms": ""
                  },
                  "parking": {
                      "label": "Type",
                  },
                  "parking": {
                      "label": "Type",
+                    "terms": "",
                      "options": {
                          "surface": "Surface",
                          "multi-storey": "Multilevel",
                      "options": {
                          "surface": "Surface",
                          "multi-storey": "Multilevel",
@@ -3500,21 +3815,26 @@
                      }
                  },
                  "payment_multi_fee": {
                      }
                  },
                  "payment_multi_fee": {
-                    "label": "Payment Types"
+                    "label": "Payment Types",
+                    "terms": ""
                  },
                  "payment_multi": {
                  },
                  "payment_multi": {
-                    "label": "Payment Types"
+                    "label": "Payment Types",
+                    "terms": ""
                  },
                  "phases": {
                      "label": "Phases",
                  },
                  "phases": {
                      "label": "Phases",
+                    "terms": "",
                      "placeholder": "1, 2, 3..."
                  },
                  "phone": {
                      "label": "Telephone",
                      "placeholder": "1, 2, 3..."
                  },
                  "phone": {
                      "label": "Telephone",
+                    "terms": "phone number",
                      "placeholder": "+31 42 123 4567"
                  },
                  "piste/difficulty_downhill": {
                      "label": "Difficulty",
                      "placeholder": "+31 42 123 4567"
                  },
                  "piste/difficulty_downhill": {
                      "label": "Difficulty",
+                    "terms": "",
                      "placeholder": "Easy, Intermediate, Advanced...",
                      "options": {
                          "novice": "Novice (instructional)",
                      "placeholder": "Easy, Intermediate, Advanced...",
                      "options": {
                          "novice": "Novice (instructional)",
@@ -3528,6 +3848,7 @@
                  },
                  "piste/difficulty_nordic": {
                      "label": "Difficulty",
                  },
                  "piste/difficulty_nordic": {
                      "label": "Difficulty",
+                    "terms": "",
                      "placeholder": "Easy, Intermediate, Advanced...",
                      "options": {
                          "novice": "Novice - Flat, no effort needed",
                      "placeholder": "Easy, Intermediate, Advanced...",
                      "options": {
                          "novice": "Novice - Flat, no effort needed",
@@ -3539,6 +3860,7 @@
                  },
                  "piste/difficulty_skitour": {
                      "label": "Difficulty",
                  },
                  "piste/difficulty_skitour": {
                      "label": "Difficulty",
+                    "terms": "",
                      "placeholder": "Easy, Intermediate, Advanced...",
                      "options": {
                          "novice": "Novice - L: <30° incline",
                      "placeholder": "Easy, Intermediate, Advanced...",
                      "options": {
                          "novice": "Novice - L: <30° incline",
@@ -3552,6 +3874,7 @@
                  },
                  "piste/difficulty": {
                      "label": "Difficulty",
                  },
                  "piste/difficulty": {
                      "label": "Difficulty",
+                    "terms": "",
                      "placeholder": "Easy, Intermediate, Advanced...",
                      "options": {
                          "novice": "Novice",
                      "placeholder": "Easy, Intermediate, Advanced...",
                      "options": {
                          "novice": "Novice",
@@ -3565,6 +3888,7 @@
                  },
                  "piste/grooming_downhill": {
                      "label": "Grooming",
                  },
                  "piste/grooming_downhill": {
                      "label": "Grooming",
+                    "terms": "",
                      "options": {
                          "classic": "Classic",
                          "mogul": "Mogul",
                      "options": {
                          "classic": "Classic",
                          "mogul": "Mogul",
@@ -3573,6 +3897,7 @@
                  },
                  "piste/grooming_hike": {
                      "label": "Grooming",
                  },
                  "piste/grooming_hike": {
                      "label": "Grooming",
+                    "terms": "",
                      "options": {
                          "classic": "Classic - Winter Hiking",
                          "backcountry": "Backcountry - Snowshoeing"
                      "options": {
                          "classic": "Classic - Winter Hiking",
                          "backcountry": "Backcountry - Snowshoeing"
@@ -3580,6 +3905,7 @@
                  },
                  "piste/grooming_nordic": {
                      "label": "Grooming",
                  },
                  "piste/grooming_nordic": {
                      "label": "Grooming",
+                    "terms": "",
                      "options": {
                          "classic": "Classic",
                          "backcountry": "Backcountry, no grooming",
                      "options": {
                          "classic": "Classic",
                          "backcountry": "Backcountry, no grooming",
@@ -3590,6 +3916,7 @@
                  },
                  "piste/grooming": {
                      "label": "Grooming",
                  },
                  "piste/grooming": {
                      "label": "Grooming",
+                    "terms": "",
                      "options": {
                          "classic": "Classic",
                          "mogul": "Mogul",
                      "options": {
                          "classic": "Classic",
                          "mogul": "Mogul",
@@ -3601,6 +3928,7 @@
                  },
                  "piste/type": {
                      "label": "Type",
                  },
                  "piste/type": {
                      "label": "Type",
+                    "terms": "",
                      "options": {
                          "downhill": "Downhill",
                          "nordic": "Nordic",
                      "options": {
                          "downhill": "Downhill",
                          "nordic": "Nordic",
@@ -3615,51 +3943,82 @@
                      }
                  },
                  "place": {
                      }
                  },
                  "place": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "plant": {
                  },
                  "plant": {
-                    "label": "Plant"
+                    "label": "Plant",
+                    "terms": ""
                  },
                  "plant/output/electricity": {
                      "label": "Power Output",
                  },
                  "plant/output/electricity": {
                      "label": "Power Output",
+                    "terms": "",
                      "placeholder": "500 MW, 1000 MW, 2000 MW..."
                  },
                  "playground": {
                      "placeholder": "500 MW, 1000 MW, 2000 MW..."
                  },
                  "playground": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "playground/baby": {
                  },
                  "playground/baby": {
-                    "label": "Baby Seat"
+                    "label": "Baby Seat",
+                    "terms": ""
                  },
                  "playground/max_age": {
                  },
                  "playground/max_age": {
-                    "label": "Maximum Age"
+                    "label": "Maximum Age",
+                    "terms": ""
                  },
                  "playground/min_age": {
                  },
                  "playground/min_age": {
-                    "label": "Minimum Age"
+                    "label": "Minimum Age",
+                    "terms": ""
+                },
+                "polling_station": {
+                    "label": "Polling Place",
+                    "terms": "voting place"
                  },
                  "population": {
                  },
                  "population": {
-                    "label": "Population"
+                    "label": "Population",
+                    "terms": ""
+                },
+                "post": {
+                    "label": "Delivery Address",
+                    "terms": ""
                  },
                  "power_supply": {
                  },
                  "power_supply": {
-                    "label": "Power Supply"
+                    "label": "Power Supply",
+                    "terms": ""
                  },
                  "power": {
                  },
                  "power": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
+                },
+                "preschool": {
+                    "label": "Preschool",
+                    "terms": ""
                  },
                  "produce": {
                  },
                  "produce": {
-                    "label": "Produce"
+                    "label": "Produce",
+                    "terms": ""
                  },
                  "product": {
                  },
                  "product": {
-                    "label": "Products"
+                    "label": "Products",
+                    "terms": ""
+                },
+                "public_bookcase/type": {
+                    "label": "Type",
+                    "terms": ""
                  },
                  "railway": {
                  },
                  "railway": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "railway/position": {
                      "label": "Milestone Position",
                  },
                  "railway/position": {
                      "label": "Milestone Position",
+                    "terms": "",
                      "placeholder": "Distance to one decimal (123.4)"
                  },
                  "railway/signal/direction": {
                      "placeholder": "Distance to one decimal (123.4)"
                  },
                  "railway/signal/direction": {
-                    "label": "Direction",
+                    "label": "Direction Affected",
+                    "terms": "",
                      "options": {
                          "forward": "Forward",
                          "backward": "Backward",
                      "options": {
                          "forward": "Forward",
                          "backward": "Backward",
@@ -3667,13 +4026,16 @@
                      }
                  },
                  "rating": {
                      }
                  },
                  "rating": {
-                    "label": "Power Rating"
+                    "label": "Power Rating",
+                    "terms": ""
                  },
                  "recycling_accepts": {
                  },
                  "recycling_accepts": {
-                    "label": "Accepts"
+                    "label": "Accepts",
+                    "terms": ""
                  },
                  "recycling_type": {
                      "label": "Type",
                  },
                  "recycling_type": {
                      "label": "Type",
+                    "terms": "",
                      "placeholder": "Container, Center",
                      "options": {
                          "container": "Container",
                      "placeholder": "Container, Center",
                      "options": {
                          "container": "Container",
@@ -3681,52 +4043,67 @@
                      }
                  },
                  "ref_aeroway_gate": {
                      }
                  },
                  "ref_aeroway_gate": {
-                    "label": "Gate Number"
+                    "label": "Gate Number",
+                    "terms": ""
                  },
                  "ref_golf_hole": {
                      "label": "Hole Number",
                  },
                  "ref_golf_hole": {
                      "label": "Hole Number",
+                    "terms": "",
                      "placeholder": "1-18"
                  },
                  "ref_highway_junction": {
                      "placeholder": "1-18"
                  },
                  "ref_highway_junction": {
-                    "label": "Junction Number"
+                    "label": "Junction Number",
+                    "terms": ""
                  },
                  "ref_platform": {
                  },
                  "ref_platform": {
-                    "label": "Platform Number"
+                    "label": "Platform Number",
+                    "terms": ""
                  },
                  "ref_road_number": {
                  },
                  "ref_road_number": {
-                    "label": "Road Number"
+                    "label": "Road Number",
+                    "terms": ""
                  },
                  "ref_room_number": {
                  },
                  "ref_room_number": {
-                    "label": "Room Number"
+                    "label": "Room Number",
+                    "terms": ""
                  },
                  "ref_route": {
                  },
                  "ref_route": {
-                    "label": "Route Number"
+                    "label": "Route Number",
+                    "terms": ""
                  },
                  "ref_runway": {
                      "label": "Runway Number",
                  },
                  "ref_runway": {
                      "label": "Runway Number",
+                    "terms": "",
                      "placeholder": "e.g. 01L/19R"
                  },
                  "ref_stop_position": {
                      "placeholder": "e.g. 01L/19R"
                  },
                  "ref_stop_position": {
-                    "label": "Stop Number"
+                    "label": "Stop Number",
+                    "terms": ""
                  },
                  "ref_taxiway": {
                      "label": "Taxiway Name",
                  },
                  "ref_taxiway": {
                      "label": "Taxiway Name",
+                    "terms": "",
                      "placeholder": "e.g. A5"
                  },
                  "ref": {
                      "placeholder": "e.g. A5"
                  },
                  "ref": {
-                    "label": "Reference Code"
+                    "label": "Reference Code",
+                    "terms": ""
                  },
                  "ref/isil": {
                  },
                  "ref/isil": {
-                    "label": "ISIL Code"
+                    "label": "ISIL Code",
+                    "terms": ""
                  },
                  "relation": {
                  },
                  "relation": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "religion": {
                  },
                  "religion": {
-                    "label": "Religion"
+                    "label": "Religion",
+                    "terms": ""
                  },
                  "reservation": {
                      "label": "Reservations",
                  },
                  "reservation": {
                      "label": "Reservations",
+                    "terms": "",
                      "options": {
                          "yes": "Accepted",
                          "no": "Not Accepted",
                      "options": {
                          "yes": "Accepted",
                          "no": "Not Accepted",
@@ -3735,34 +4112,44 @@
                      }
                  },
                  "resort": {
                      }
                  },
                  "resort": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "resource": {
                  },
                  "resource": {
-                    "label": "Resources"
+                    "label": "Resources",
+                    "terms": ""
                  },
                  "restriction": {
                  },
                  "restriction": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "restrictions": {
                  },
                  "restrictions": {
-                    "label": "Turn Restrictions"
+                    "label": "Turn Restrictions",
+                    "terms": ""
                  },
                  "roof/colour": {
                  },
                  "roof/colour": {
-                    "label": "Roof Color"
+                    "label": "Roof Color",
+                    "terms": ""
                  },
                  "room": {
                  },
                  "room": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "rooms": {
                  },
                  "rooms": {
-                    "label": "Rooms"
+                    "label": "Rooms",
+                    "terms": ""
                  },
                  "route_master": {
                  },
                  "route_master": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "route": {
                  },
                  "route": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "sac_scale": {
                      "label": "Hiking Difficulty",
                  },
                  "sac_scale": {
                      "label": "Hiking Difficulty",
+                    "terms": "",
                      "placeholder": "Mountain Hiking, Alpine Hiking...",
                      "options": {
                          "hiking": "T1: Hiking",
                      "placeholder": "Mountain Hiking, Alpine Hiking...",
                      "options": {
                          "hiking": "T1: Hiking",
@@ -3774,23 +4161,29 @@
                      }
                  },
                  "salt": {
                      }
                  },
                  "salt": {
-                    "label": "Salt"
+                    "label": "Salt",
+                    "terms": "saline,salinated"
                  },
                  "sanitary_dump_station": {
                  },
                  "sanitary_dump_station": {
-                    "label": "Toilet Disposal"
+                    "label": "Toilet Disposal",
+                    "terms": ""
                  },
                  "screen": {
                      "label": "Screens",
                  },
                  "screen": {
                      "label": "Screens",
+                    "terms": "",
                      "placeholder": "1, 4, 8…"
                  },
                  "scuba_diving": {
                      "placeholder": "1, 4, 8…"
                  },
                  "scuba_diving": {
-                    "label": "Services"
+                    "label": "Services",
+                    "terms": ""
                  },
                  "seamark/beacon_isolated_danger/shape": {
                  },
                  "seamark/beacon_isolated_danger/shape": {
-                    "label": "Shape"
+                    "label": "Shape",
+                    "terms": ""
                  },
                  "seamark/beacon_lateral/category": {
                      "label": "Category",
                  },
                  "seamark/beacon_lateral/category": {
                      "label": "Category",
+                    "terms": "",
                      "options": {
                          "port": "Port",
                          "starboard": "Starboard",
                      "options": {
                          "port": "Port",
                          "starboard": "Starboard",
@@ -3802,6 +4195,7 @@
                  },
                  "seamark/beacon_lateral/colour": {
                      "label": "Color",
                  },
                  "seamark/beacon_lateral/colour": {
                      "label": "Color",
+                    "terms": "",
                      "options": {
                          "red": "Red",
                          "green": "Green",
                      "options": {
                          "red": "Red",
                          "green": "Green",
@@ -3809,10 +4203,12 @@
                      }
                  },
                  "seamark/beacon_lateral/shape": {
                      }
                  },
                  "seamark/beacon_lateral/shape": {
-                    "label": "Shape"
+                    "label": "Shape",
+                    "terms": ""
                  },
                  "seamark/beacon_lateral/system": {
                      "label": "System",
                  },
                  "seamark/beacon_lateral/system": {
                      "label": "System",
+                    "terms": "",
                      "options": {
                          "iala-a": "IALA A",
                          "iala-b": "IALA B",
                      "options": {
                          "iala-a": "IALA A",
                          "iala-b": "IALA B",
@@ -3822,6 +4218,7 @@
                  },
                  "seamark/buoy_lateral/category": {
                      "label": "Category",
                  },
                  "seamark/buoy_lateral/category": {
                      "label": "Category",
+                    "terms": "",
                      "options": {
                          "port": "Port",
                          "starboard": "Starboard",
                      "options": {
                          "port": "Port",
                          "starboard": "Starboard",
@@ -3837,6 +4234,7 @@
                  },
                  "seamark/buoy_lateral/colour": {
                      "label": "Color",
                  },
                  "seamark/buoy_lateral/colour": {
                      "label": "Color",
+                    "terms": "",
                      "options": {
                          "red": "Red",
                          "green": "Green",
                      "options": {
                          "red": "Red",
                          "green": "Green",
@@ -3849,10 +4247,12 @@
                      }
                  },
                  "seamark/buoy_lateral/shape": {
                      }
                  },
                  "seamark/buoy_lateral/shape": {
-                    "label": "Shape"
+                    "label": "Shape",
+                    "terms": ""
                  },
                  "seamark/buoy_lateral/system": {
                      "label": "System",
                  },
                  "seamark/buoy_lateral/system": {
                      "label": "System",
+                    "terms": "",
                      "options": {
                          "iala-a": "IALA A",
                          "iala-b": "IALA B",
                      "options": {
                          "iala-a": "IALA A",
                          "iala-b": "IALA B",
@@ -3861,23 +4261,29 @@
                      }
                  },
                  "seamark/mooring/category": {
                      }
                  },
                  "seamark/mooring/category": {
-                    "label": "Category"
+                    "label": "Category",
+                    "terms": ""
                  },
                  "seamark/type": {
                  },
                  "seamark/type": {
-                    "label": "Seamark"
+                    "label": "Seamark",
+                    "terms": "marine"
                  },
                  "seamark/wreck/category": {
                  },
                  "seamark/wreck/category": {
-                    "label": "Category"
+                    "label": "Category",
+                    "terms": ""
                  },
                  "seasonal": {
                  },
                  "seasonal": {
-                    "label": "Seasonal"
+                    "label": "Seasonal",
+                    "terms": ""
                  },
                  "seats": {
                      "label": "Seats",
                  },
                  "seats": {
                      "label": "Seats",
+                    "terms": "",
                      "placeholder": "2, 4, 6..."
                  },
                  "second_hand": {
                      "label": "Sells Used",
                      "placeholder": "2, 4, 6..."
                  },
                  "second_hand": {
                      "label": "Sells Used",
+                    "terms": "",
                      "placeholder": "Yes, No, Only",
                      "options": {
                          "yes": "Yes",
                      "placeholder": "Yes, No, Only",
                      "options": {
                          "yes": "Yes",
@@ -3886,10 +4292,12 @@
                      }
                  },
                  "self_service": {
                      }
                  },
                  "self_service": {
-                    "label": "Self-Service"
+                    "label": "Self-Service",
+                    "terms": ""
                  },
                  "service_rail": {
                      "label": "Service Type",
                  },
                  "service_rail": {
                      "label": "Service Type",
+                    "terms": "",
                      "options": {
                          "spur": "Spur",
                          "yard": "Yard",
                      "options": {
                          "spur": "Spur",
                          "yard": "Yard",
@@ -3898,31 +4306,40 @@
                      }
                  },
                  "service_times": {
                      }
                  },
                  "service_times": {
-                    "label": "Service Times"
+                    "label": "Service Times",
+                    "terms": ""
                  },
                  "service": {
                  },
                  "service": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "service/bicycle": {
                  },
                  "service/bicycle": {
-                    "label": "Services"
+                    "label": "Services",
+                    "terms": ""
                  },
                  "service/vehicle": {
                  },
                  "service/vehicle": {
-                    "label": "Services"
+                    "label": "Services",
+                    "terms": ""
                  },
                  "shelter_type": {
                  },
                  "shelter_type": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "shelter": {
                  },
                  "shelter": {
-                    "label": "Shelter"
+                    "label": "Shelter",
+                    "terms": ""
                  },
                  "shop": {
                  },
                  "shop": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "siren/purpose": {
                  },
                  "siren/purpose": {
-                    "label": "Purpose"
+                    "label": "Purpose",
+                    "terms": ""
                  },
                  "siren/type": {
                      "label": "Type",
                  },
                  "siren/type": {
                      "label": "Type",
+                    "terms": "",
                      "options": {
                          "pneumatic": "Pneumatic",
                          "electronic": "Electronic",
                      "options": {
                          "pneumatic": "Pneumatic",
                          "electronic": "Electronic",
@@ -3930,13 +4347,16 @@
                      }
                  },
                  "site_type": {
                      }
                  },
                  "site_type": {
-                    "label": "Site Type"
+                    "label": "Site Type",
+                    "terms": ""
                  },
                  "site": {
                  },
                  "site": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "smoking": {
                      "label": "Smoking",
                  },
                  "smoking": {
                      "label": "Smoking",
+                    "terms": "",
                      "placeholder": "No, Separated, Yes...",
                      "options": {
                          "no": "No smoking anywhere",
                      "placeholder": "No, Separated, Yes...",
                      "options": {
                          "no": "No smoking anywhere",
@@ -3949,6 +4369,7 @@
                  },
                  "smoothness": {
                      "label": "Smoothness",
                  },
                  "smoothness": {
                      "label": "Smoothness",
+                    "terms": "",
                      "placeholder": "Thin Rollers, Wheels, Off-Road...",
                      "options": {
                          "excellent": "Thin Rollers: rollerblade, skateboard",
                      "placeholder": "Thin Rollers, Wheels, Off-Road...",
                      "options": {
                          "excellent": "Thin Rollers: rollerblade, skateboard",
@@ -3962,47 +4383,68 @@
                      }
                  },
                  "social_facility_for": {
                      }
                  },
                  "social_facility_for": {
-                    "label": "People Served"
+                    "label": "People Served",
+                    "terms": ""
                  },
                  "social_facility": {
                  },
                  "social_facility": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "source": {
                  },
                  "source": {
-                    "label": "Sources"
+                    "label": "Sources",
+                    "terms": "reference"
+                },
+                "species/wikidata": {
+                    "label": "Species Wikidata",
+                    "terms": ""
                  },
                  "sport_ice": {
                  },
                  "sport_ice": {
-                    "label": "Sports"
+                    "label": "Sports",
+                    "terms": ""
                  },
                  "sport_racing_motor": {
                  },
                  "sport_racing_motor": {
-                    "label": "Sports"
+                    "label": "Sports",
+                    "terms": ""
                  },
                  "sport_racing_nonmotor": {
                  },
                  "sport_racing_nonmotor": {
-                    "label": "Sports"
+                    "label": "Sports",
+                    "terms": ""
                  },
                  "sport": {
                  },
                  "sport": {
-                    "label": "Sports"
+                    "label": "Sports",
+                    "terms": ""
                  },
                  "stars": {
                  },
                  "stars": {
-                    "label": "Stars"
+                    "label": "Stars",
+                    "terms": "rating"
                  },
                  "start_date": {
                  },
                  "start_date": {
-                    "label": "Start Date"
+                    "label": "Start Date",
+                    "terms": "inception"
                  },
                  "step_count": {
                  },
                  "step_count": {
-                    "label": "Number of Steps"
+                    "label": "Number of Steps",
+                    "terms": ""
                  },
                  "stop": {
                      "label": "Stop Type",
                  },
                  "stop": {
                      "label": "Stop Type",
+                    "terms": "",
                      "options": {
                          "all": "All Ways",
                          "minor": "Minor Road"
                      }
                  },
                  "street_cabinet": {
                      "options": {
                          "all": "All Ways",
                          "minor": "Minor Road"
                      }
                  },
                  "street_cabinet": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
+                },
+                "stroller": {
+                    "label": "Stroller Access",
+                    "terms": "baby carriage,perambulator,pram,pushchair"
                  },
                  "structure_waterway": {
                      "label": "Structure",
                  },
                  "structure_waterway": {
                      "label": "Structure",
+                    "terms": "",
                      "placeholder": "Unknown",
                      "options": {
                          "tunnel": "Tunnel"
                      "placeholder": "Unknown",
                      "options": {
                          "tunnel": "Tunnel"
@@ -4010,6 +4452,7 @@
                  },
                  "structure": {
                      "label": "Structure",
                  },
                  "structure": {
                      "label": "Structure",
+                    "terms": "",
                      "placeholder": "Unknown",
                      "options": {
                          "bridge": "Bridge",
                      "placeholder": "Unknown",
                      "options": {
                          "bridge": "Bridge",
@@ -4020,28 +4463,36 @@
                      }
                  },
                  "studio": {
                      }
                  },
                  "studio": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "substance": {
                  },
                  "substance": {
-                    "label": "Substance"
+                    "label": "Substance",
+                    "terms": ""
                  },
                  "substation": {
                  },
                  "substation": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "supervised": {
                  },
                  "supervised": {
-                    "label": "Supervised"
+                    "label": "Supervised",
+                    "terms": "guarded,manned"
                  },
                  "support": {
                  },
                  "support": {
-                    "label": "Support"
+                    "label": "Support",
+                    "terms": ""
                  },
                  "surface": {
                  },
                  "surface": {
-                    "label": "Surface"
+                    "label": "Surface",
+                    "terms": ""
                  },
                  "surveillance": {
                  },
                  "surveillance": {
-                    "label": "Surveillance Kind"
+                    "label": "Surveillance Kind",
+                    "terms": ""
                  },
                  "surveillance/type": {
                      "label": "Surveillance Type",
                  },
                  "surveillance/type": {
                      "label": "Surveillance Type",
+                    "terms": "",
                      "options": {
                          "camera": "Camera",
                          "guard": "Guard",
                      "options": {
                          "camera": "Camera",
                          "guard": "Guard",
@@ -4049,16 +4500,20 @@
                      }
                  },
                  "surveillance/zone": {
                      }
                  },
                  "surveillance/zone": {
-                    "label": "Surveillance Zone"
+                    "label": "Surveillance Zone",
+                    "terms": ""
                  },
                  "survey/date": {
                  },
                  "survey/date": {
-                    "label": "Last Survey Date"
+                    "label": "Last Survey Date",
+                    "terms": ""
                  },
                  "swimming_pool": {
                  },
                  "swimming_pool": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "switch": {
                      "label": "Type",
                  },
                  "switch": {
                      "label": "Type",
+                    "terms": "",
                      "options": {
                          "mechanical": "Mechanical",
                          "circuit_breaker": "Circuit Breaker",
                      "options": {
                          "mechanical": "Mechanical",
                          "circuit_breaker": "Circuit Breaker",
@@ -4067,10 +4522,12 @@
                      }
                  },
                  "tactile_paving": {
                      }
                  },
                  "tactile_paving": {
-                    "label": "Tactile Paving"
+                    "label": "Tactile Paving",
+                    "terms": ""
                  },
                  "takeaway": {
                      "label": "Takeaway",
                  },
                  "takeaway": {
                      "label": "Takeaway",
+                    "terms": "take out,takeout",
                      "placeholder": "Yes, No, Takeaway Only...",
                      "options": {
                          "yes": "Yes",
                      "placeholder": "Yes, No, Takeaway Only...",
                      "options": {
                          "yes": "Yes",
@@ -4079,16 +4536,20 @@
                      }
                  },
                  "target": {
                      }
                  },
                  "target": {
-                    "label": "Target"
+                    "label": "Target",
+                    "terms": ""
                  },
                  "tidal": {
                  },
                  "tidal": {
-                    "label": "Tidal"
+                    "label": "Tidal",
+                    "terms": ""
                  },
                  "to": {
                  },
                  "to": {
-                    "label": "To"
+                    "label": "To",
+                    "terms": ""
                  },
                  "toilets/disposal": {
                      "label": "Disposal",
                  },
                  "toilets/disposal": {
                      "label": "Disposal",
+                    "terms": "",
                      "options": {
                          "flush": "Flush",
                          "pitlatrine": "Pit Latrine",
                      "options": {
                          "flush": "Flush",
                          "pitlatrine": "Pit Latrine",
@@ -4097,29 +4558,37 @@
                      }
                  },
                  "toilets/handwashing": {
                      }
                  },
                  "toilets/handwashing": {
-                    "label": "Handwashing"
+                    "label": "Handwashing",
+                    "terms": ""
                  },
                  "toilets/position": {
                  },
                  "toilets/position": {
-                    "label": "Positions"
+                    "label": "Positions",
+                    "terms": ""
                  },
                  "toll": {
                  },
                  "toll": {
-                    "label": "Toll"
+                    "label": "Toll",
+                    "terms": ""
                  },
                  "tomb": {
                  },
                  "tomb": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "tourism": {
                  },
                  "tourism": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "tower/construction": {
                      "label": "Construction",
                  },
                  "tower/construction": {
                      "label": "Construction",
+                    "terms": "",
                      "placeholder": "Guyed, Lattice, Concealed, ..."
                  },
                  "tower/type": {
                      "placeholder": "Guyed, Lattice, Concealed, ..."
                  },
                  "tower/type": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "tracktype": {
                      "label": "Track Type",
                  },
                  "tracktype": {
                      "label": "Track Type",
+                    "terms": "",
                      "placeholder": "Solid, Mostly Solid, Soft...",
                      "options": {
                          "grade1": "Solid: paved or heavily compacted hardcore surface",
                      "placeholder": "Solid, Mostly Solid, Soft...",
                      "options": {
                          "grade1": "Solid: paved or heavily compacted hardcore surface",
@@ -4130,16 +4599,20 @@
                      }
                  },
                  "trade": {
                      }
                  },
                  "trade": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "traffic_calming": {
                  },
                  "traffic_calming": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "traffic_sign": {
                  },
                  "traffic_sign": {
-                    "label": "Traffic Sign"
+                    "label": "Traffic Sign",
+                    "terms": ""
                  },
                  "traffic_sign/direction": {
                  },
                  "traffic_sign/direction": {
-                    "label": "Direction",
+                    "label": "Direction Affected",
+                    "terms": "",
                      "options": {
                          "forward": "Forward",
                          "backward": "Backward",
                      "options": {
                          "forward": "Forward",
                          "backward": "Backward",
@@ -4147,10 +4620,12 @@
                      }
                  },
                  "traffic_signals": {
                      }
                  },
                  "traffic_signals": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "traffic_signals/direction": {
                  },
                  "traffic_signals/direction": {
-                    "label": "Direction",
+                    "label": "Direction Affected",
+                    "terms": "",
                      "options": {
                          "forward": "Forward",
                          "backward": "Backward",
                      "options": {
                          "forward": "Forward",
                          "backward": "Backward",
@@ -4159,6 +4634,7 @@
                  },
                  "trail_visibility": {
                      "label": "Trail Visibility",
                  },
                  "trail_visibility": {
                      "label": "Trail Visibility",
+                    "terms": "",
                      "placeholder": "Excellent, Good, Bad...",
                      "options": {
                          "excellent": "Excellent: unambiguous path or markers everywhere",
                      "placeholder": "Excellent, Good, Bad...",
                      "options": {
                          "excellent": "Excellent: unambiguous path or markers everywhere",
@@ -4171,6 +4647,7 @@
                  },
                  "transformer": {
                      "label": "Type",
                  },
                  "transformer": {
                      "label": "Type",
+                    "terms": "",
                      "options": {
                          "distribution": "Distribution",
                          "generator": "Generator",
                      "options": {
                          "distribution": "Distribution",
                          "generator": "Generator",
@@ -4183,17 +4660,25 @@
                      }
                  },
                  "trees": {
                      }
                  },
                  "trees": {
-                    "label": "Trees"
+                    "label": "Trees",
+                    "terms": ""
+                },
+                "trench": {
+                    "label": "Type",
+                    "terms": ""
                  },
                  "trolley_wire": {
                  },
                  "trolley_wire": {
-                    "label": "Overhead Trolley Wires"
+                    "label": "Overhead Trolley Wires",
+                    "terms": ""
                  },
                  "tunnel": {
                      "label": "Type",
                  },
                  "tunnel": {
                      "label": "Type",
+                    "terms": "",
                      "placeholder": "Default"
                  },
                  "usage_rail": {
                      "label": "Usage Type",
                      "placeholder": "Default"
                  },
                  "usage_rail": {
                      "label": "Usage Type",
+                    "terms": "",
                      "options": {
                          "main": "Main",
                          "branch": "Branch",
                      "options": {
                          "main": "Main",
                          "branch": "Branch",
@@ -4203,11 +4688,17 @@
                          "tourism": "Tourism"
                      }
                  },
                          "tourism": "Tourism"
                      }
                  },
+                "valve": {
+                    "label": "Type",
+                    "terms": ""
+                },
                  "vending": {
                  "vending": {
-                    "label": "Types of Goods"
+                    "label": "Types of Goods",
+                    "terms": ""
                  },
                  "visibility": {
                      "label": "Visibility",
                  },
                  "visibility": {
                      "label": "Visibility",
+                    "terms": "",
                      "options": {
                          "house": "Up to 5m (16ft)",
                          "street": "5 to 20m (16 to 65ft)",
                      "options": {
                          "house": "Up to 5m (16ft)",
                          "street": "5 to 20m (16 to 65ft)",
@@ -4216,6 +4707,7 @@
                  },
                  "volcano/status": {
                      "label": "Volcano Status",
                  },
                  "volcano/status": {
                      "label": "Volcano Status",
+                    "terms": "",
                      "options": {
                          "active": "Active",
                          "dormant": "Dormant",
                      "options": {
                          "active": "Active",
                          "dormant": "Dormant",
@@ -4224,6 +4716,7 @@
                  },
                  "volcano/type": {
                      "label": "Volcano Type",
                  },
                  "volcano/type": {
                      "label": "Volcano Type",
+                    "terms": "",
                      "options": {
                          "stratovolcano": "Stratovolcano",
                          "shield": "Shield",
                      "options": {
                          "stratovolcano": "Stratovolcano",
                          "shield": "Shield",
@@ -4231,66 +4724,86 @@
                      }
                  },
                  "voltage_electrified": {
                      }
                  },
                  "voltage_electrified": {
-                    "label": "Voltage"
+                    "label": "Voltage",
+                    "terms": ""
                  },
                  "voltage": {
                  },
                  "voltage": {
-                    "label": "Voltage"
+                    "label": "Voltage",
+                    "terms": ""
                  },
                  "voltage/primary": {
                  },
                  "voltage/primary": {
-                    "label": "Primary Voltage"
+                    "label": "Primary Voltage",
+                    "terms": ""
                  },
                  "voltage/secondary": {
                  },
                  "voltage/secondary": {
-                    "label": "Secondary Voltage"
+                    "label": "Secondary Voltage",
+                    "terms": ""
                  },
                  "voltage/tertiary": {
                  },
                  "voltage/tertiary": {
-                    "label": "Tertiary Voltage"
+                    "label": "Tertiary Voltage",
+                    "terms": ""
                  },
                  "wall": {
                  },
                  "wall": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "water_point": {
                  },
                  "water_point": {
-                    "label": "Water Point"
+                    "label": "Water Point",
+                    "terms": ""
                  },
                  "water_source": {
                  },
                  "water_source": {
-                    "label": "Water Source"
+                    "label": "Water Source",
+                    "terms": ""
                  },
                  "water_volume": {
                  },
                  "water_volume": {
-                    "label": "Water Reserve Volume (m³)"
+                    "label": "Water Reserve Volume (m³)",
+                    "terms": ""
                  },
                  "water": {
                  },
                  "water": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "waterway": {
                  },
                  "waterway": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "website": {
                      "label": "Website",
                  },
                  "website": {
                      "label": "Website",
+                    "terms": "internet presence,uri,url,webpage",
                      "placeholder": "https://example.com"
                  },
                  "wetland": {
                      "placeholder": "https://example.com"
                  },
                  "wetland": {
-                    "label": "Type"
+                    "label": "Type",
+                    "terms": ""
                  },
                  "wheelchair": {
                  },
                  "wheelchair": {
-                    "label": "Wheelchair Access"
+                    "label": "Wheelchair Access",
+                    "terms": "handicap access"
                  },
                  "wholesale": {
                  },
                  "wholesale": {
-                    "label": "Wholesale"
+                    "label": "Wholesale",
+                    "terms": ""
                  },
                  "width": {
                  },
                  "width": {
-                    "label": "Width (Meters)"
+                    "label": "Width (Meters)",
+                    "terms": ""
                  },
                  "wikidata": {
                  },
                  "wikidata": {
-                    "label": "Wikidata"
+                    "label": "Wikidata",
+                    "terms": ""
                  },
                  "wikipedia": {
                  },
                  "wikipedia": {
-                    "label": "Wikipedia"
+                    "label": "Wikipedia",
+                    "terms": ""
                  },
                  "windings": {
                      "label": "Windings",
                  },
                  "windings": {
                      "label": "Windings",
+                    "terms": "",
                      "placeholder": "1, 2, 3..."
                  },
                  "windings/configuration": {
                      "label": "Windings Configuration",
                      "placeholder": "1, 2, 3..."
                  },
                  "windings/configuration": {
                      "label": "Windings Configuration",
+                    "terms": "",
                      "options": {
                          "star": "Star / Wye",
                          "delta": "Delta",
                      "options": {
                          "star": "Star / Wye",
                          "delta": "Delta",
@@ -4335,6 +4848,10 @@
                      "name": "Emergency Feature",
                      "terms": ""
                  },
                      "name": "Emergency Feature",
                      "terms": ""
                  },
+                "ford_line": {
+                    "name": "Ford",
+                    "terms": ""
+                },
                  "highway": {
                      "name": "Highway",
                      "terms": ""
                  "highway": {
                      "name": "Highway",
                      "terms": ""
@@ -4387,6 +4904,10 @@
                      "name": "Waterway",
                      "terms": ""
                  },
                      "name": "Waterway",
                      "terms": ""
                  },
+                "addr/interpolation": {
+                    "name": "Address Interpolation",
+                    "terms": ""
+                },
                  "address": {
                      "name": "Address",
                      "terms": ""
                  "address": {
                      "name": "Address",
                      "terms": ""
@@ -4475,10 +4996,18 @@
                      "name": "Helipad",
                      "terms": "helicopter,helipad,heliport"
                  },
                      "name": "Helipad",
                      "terms": "helicopter,helipad,heliport"
                  },
+                "aeroway/holding_position": {
+                    "name": "Aircraft Holding Position",
+                    "terms": ""
+                },
                  "aeroway/jet_bridge": {
                      "name": "Jet Bridge",
                      "terms": "aerobridge,air jetty,airbridge,finger,gangway,jet way,jetway,passenger boarding bridge,PBB,portal,skybridge,terminal gate connector"
                  },
                  "aeroway/jet_bridge": {
                      "name": "Jet Bridge",
                      "terms": "aerobridge,air jetty,airbridge,finger,gangway,jet way,jetway,passenger boarding bridge,PBB,portal,skybridge,terminal gate connector"
                  },
+                "aeroway/parking_position": {
+                    "name": "Aircraft Parking Position",
+                    "terms": ""
+                },
                  "aeroway/runway": {
                      "name": "Runway",
                      "terms": "landing strip"
                  "aeroway/runway": {
                      "name": "Runway",
                      "terms": "landing strip"
@@ -4545,7 +5074,7 @@
                  },
                  "amenity/animal_shelter": {
                      "name": "Animal Shelter",
                  },
                  "amenity/animal_shelter": {
                      "name": "Animal Shelter",
-                    "terms": "adoption,aspca,cat,dog,horse,kitten,pet care,pet rescue,puppy,raptor,reptile,rescue,spca"
+                    "terms": "adoption,aspca,cat,dog,horse,kitten,pet care,pet rescue,puppy,raptor,reptile,rescue,spca,pound"
                  },
                  "amenity/arts_centre": {
                      "name": "Arts Center",
                  },
                  "amenity/arts_centre": {
                      "name": "Arts Center",
@@ -4573,7 +5102,7 @@
                  },
                  "amenity/bench": {
                      "name": "Bench",
                  },
                  "amenity/bench": {
                      "name": "Bench",
-                    "terms": "seat"
+                    "terms": "seat,chair"
                  },
                  "amenity/bicycle_parking": {
                      "name": "Bicycle Parking",
                  },
                  "amenity/bicycle_parking": {
                      "name": "Bicycle Parking",
@@ -4593,11 +5122,11 @@
                  },
                  "amenity/bicycle_rental": {
                      "name": "Bicycle Rental",
                  },
                  "amenity/bicycle_rental": {
                      "name": "Bicycle Rental",
-                    "terms": "bike"
+                    "terms": "bike,bicycle,bikeshare,bike share,bicycle share,hub,dock"
                  },
                  "amenity/bicycle_repair_station": {
                      "name": "Bicycle Repair Tool Stand",
                  },
                  "amenity/bicycle_repair_station": {
                      "name": "Bicycle Repair Tool Stand",
-                    "terms": "bike,repair,chain,pump"
+                    "terms": "bike,repair,chain,pump,tools,stand,multitool"
                  },
                  "amenity/biergarten": {
                      "name": "Biergarten",
                  },
                  "amenity/biergarten": {
                      "name": "Biergarten",
@@ -4661,7 +5190,7 @@
                  },
                  "amenity/clock": {
                      "name": "Clock",
                  },
                  "amenity/clock": {
                      "name": "Clock",
-                    "terms": ""
+                    "terms": "time"
                  },
                  "amenity/clock/sundial": {
                      "name": "Sundial",
                  },
                  "amenity/clock/sundial": {
                      "name": "Sundial",
@@ -4711,6 +5240,10 @@
                      "name": "Dojo / Martial Arts Academy",
                      "terms": "martial arts,dojang"
                  },
                      "name": "Dojo / Martial Arts Academy",
                      "terms": "martial arts,dojang"
                  },
+                "amenity/dressing_room": {
+                    "name": "Changing Room",
+                    "terms": "changeroom,dressing room,fitting room,locker room"
+                },
                  "amenity/drinking_water": {
                      "name": "Drinking Water",
                      "terms": "potable water source,water fountain,drinking fountain,bubbler,water tap"
                  "amenity/drinking_water": {
                      "name": "Drinking Water",
                      "terms": "potable water source,water fountain,drinking fountain,bubbler,water tap"
@@ -4803,6 +5336,10 @@
                      "name": "Internet Cafe",
                      "terms": "cybercafe,taxiphone,teleboutique,coffee,cafe,net,lanhouse"
                  },
                      "name": "Internet Cafe",
                      "terms": "cybercafe,taxiphone,teleboutique,coffee,cafe,net,lanhouse"
                  },
+                "amenity/karaoke": {
+                    "name": "Karaoke Box",
+                    "terms": "karaoke club,karaoke room,karaoke television,KTV"
+                },
                  "amenity/kindergarten": {
                      "name": "Preschool/Kindergarten Grounds",
                      "terms": "kindergarden,pre-school"
                  "amenity/kindergarten": {
                      "name": "Preschool/Kindergarten Grounds",
                      "terms": "kindergarden,pre-school"
@@ -4811,6 +5348,10 @@
                      "name": "Language School",
                      "terms": "esl"
                  },
                      "name": "Language School",
                      "terms": "esl"
                  },
+                "amenity/letter_box": {
+                    "name": "Letter Box",
+                    "terms": "curbside delivery box,home delivery box,direct-to-door delivery box,letter hole,letter plate,letter slot,letterbox,letterhole,letterplate,letterslot,mail box,mail hole,mail slot,mailbox,mailhole,mailslot,through-door delivery box"
+                },
                  "amenity/library": {
                      "name": "Library",
                      "terms": "book"
                  "amenity/library": {
                      "name": "Library",
                      "terms": "book"
@@ -4863,6 +5404,10 @@
                      "name": "Multilevel Parking Garage",
                      "terms": "car,indoor parking,multistorey car park,parkade,parking building,parking deck,parking garage,parking ramp,parking structure"
                  },
                      "name": "Multilevel Parking Garage",
                      "terms": "car,indoor parking,multistorey car park,parkade,parking building,parking deck,parking garage,parking ramp,parking structure"
                  },
+                "amenity/parking/park_ride": {
+                    "name": "Park & Ride Lot",
+                    "terms": "commuter parking lot,incentive parking lot,metro parking lot,park and pool lot,park and ride lot,P+R,public transport parking lot,public transit parking lot,train parking lot"
+                },
                  "amenity/parking/underground": {
                      "name": "Underground Parking",
                      "terms": "automobile parking,car lot,car parking,rv parking,subsurface parking,truck parking,vehicle parking"
                  "amenity/parking/underground": {
                      "name": "Underground Parking",
                      "terms": "automobile parking,car lot,car parking,rv parking,subsurface parking,truck parking,vehicle parking"
@@ -4895,6 +5440,18 @@
                      "name": "Christian Church",
                      "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple"
                  },
                      "name": "Christian Church",
                      "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple"
                  },
+                "amenity/place_of_worship/christian/jehovahs_witness": {
+                    "name": "Kingdom Hall of Jehovah's Witnesses",
+                    "terms": "christian,church,house of God,house of prayer,house of worship"
+                },
+                "amenity/place_of_worship/christian/la_luz_del_mundo": {
+                    "name": "La Luz del Mundo Temple",
+                    "terms": "christian,church,house of God,house of prayer,house of worship,the light of the world church"
+                },
+                "amenity/place_of_worship/christian/quaker": {
+                    "name": "Quaker Friends Meeting House",
+                    "terms": "christian,church,house of God,house of prayer,house of worship"
+                },
                  "amenity/place_of_worship/hindu": {
                      "name": "Hindu Temple",
                      "terms": "kovil,devasthana,mandir,kshetram,alayam,shrine,temple"
                  "amenity/place_of_worship/hindu": {
                      "name": "Hindu Temple",
                      "terms": "kovil,devasthana,mandir,kshetram,alayam,shrine,temple"
@@ -4905,7 +5462,7 @@
                  },
                  "amenity/place_of_worship/muslim": {
                      "name": "Muslim Mosque",
                  },
                  "amenity/place_of_worship/muslim": {
                      "name": "Muslim Mosque",
-                    "terms": "muslim"
+                    "terms": "islam,islamic center,muslim"
                  },
                  "amenity/place_of_worship/shinto": {
                      "name": "Shinto Shrine",
                  },
                  "amenity/place_of_worship/shinto": {
                      "name": "Shinto Shrine",
@@ -4927,9 +5484,17 @@
                      "name": "Police",
                      "terms": "badge,constable,constabulary,cop,detective,fed,law,enforcement,officer,patrol"
                  },
                      "name": "Police",
                      "terms": "badge,constable,constabulary,cop,detective,fed,law,enforcement,officer,patrol"
                  },
+                "amenity/polling_station": {
+                    "name": "Permanent Polling Place",
+                    "terms": "ballot box,ballot drop,democracy,elections,polling place,vote,voting booth,voting machine"
+                },
                  "amenity/post_box": {
                      "name": "Mailbox",
                  "amenity/post_box": {
                      "name": "Mailbox",
-                    "terms": "letter,post"
+                    "terms": "letter drop,mail box,package drop,post box,postal box"
+                },
+                "amenity/post_depot": {
+                    "name": "Post Sorting Office",
+                    "terms": "mail processing and distribution center,post depot"
                  },
                  "amenity/post_office": {
                      "name": "Post Office",
                  },
                  "amenity/post_office": {
                      "name": "Post Office",
@@ -4941,7 +5506,7 @@
                  },
                  "amenity/prison": {
                      "name": "Prison Grounds",
                  },
                  "amenity/prison": {
                      "name": "Prison Grounds",
-                    "terms": "cell,jail"
+                    "terms": "cell,jail,correction"
                  },
                  "amenity/pub": {
                      "name": "Pub",
                  },
                  "amenity/pub": {
                      "name": "Pub",
@@ -4975,6 +5540,14 @@
                      "name": "Recycling Container",
                      "terms": "bin,can,bottle,glass,garbage,rubbish,scrap,trash"
                  },
                      "name": "Recycling Container",
                      "terms": "bin,can,bottle,glass,garbage,rubbish,scrap,trash"
                  },
+                "amenity/recycling/container/electrical_items": {
+                    "name": "E-Waste Container",
+                    "terms": "computers,electronic waste,electronics recycling,ewaste bin,phones,tablets"
+                },
+                "amenity/recycling/container/green_waste": {
+                    "name": "Green Waste Container",
+                    "terms": "biodegradable,biological,compost,decomposable,garbage bin,garden waste,organic,rubbish,food scrap"
+                },
                  "amenity/restaurant": {
                      "name": "Restaurant",
                      "terms": "bar,breakfast,cafe,café,canteen,coffee,dine,dining,dinner,drive-in,eat,grill,lunch,table"
                  "amenity/restaurant": {
                      "name": "Restaurant",
                      "terms": "bar,breakfast,cafe,café,canteen,coffee,dine,dining,dinner,drive-in,eat,grill,lunch,table"
@@ -5167,6 +5740,10 @@
                      "name": "Vending Machine",
                      "terms": ""
                  },
                      "name": "Vending Machine",
                      "terms": ""
                  },
+                "amenity/vending_machine/bottle_return": {
+                    "name": "Bottle Return Machine",
+                    "terms": "bottle return"
+                },
                  "amenity/vending_machine/cigarettes": {
                      "name": "Cigarette Vending Machine",
                      "terms": "cigarette"
                  "amenity/vending_machine/cigarettes": {
                      "name": "Cigarette Vending Machine",
                      "terms": "cigarette"
@@ -5675,10 +6252,6 @@
                      "name": "Warehouse",
                      "terms": ""
                  },
                      "name": "Warehouse",
                      "terms": ""
                  },
-                "camp_site/camp_pitch": {
-                    "name": "Camp Pitch",
-                    "terms": "tent,rv"
-                },
                  "club": {
                      "name": "Club",
                      "terms": "social"
                  "club": {
                      "name": "Club",
                      "terms": "social"
@@ -5871,6 +6444,10 @@
                      "name": "Shoemaker",
                      "terms": "cobbler"
                  },
                      "name": "Shoemaker",
                      "terms": "cobbler"
                  },
+                "craft/signmaker": {
+                    "name": "Signmaker",
+                    "terms": ""
+                },
                  "craft/stonemason": {
                      "name": "Stonemason",
                      "terms": "masonry"
                  "craft/stonemason": {
                      "name": "Stonemason",
                      "terms": "masonry"
@@ -6047,6 +6624,10 @@
                      "name": "Blood Donor Center",
                      "terms": "blood bank,blood donation,blood transfusion,apheresis,plasmapheresis,plateletpheresis,stem cell donation"
                  },
                      "name": "Blood Donor Center",
                      "terms": "blood bank,blood donation,blood transfusion,apheresis,plasmapheresis,plateletpheresis,stem cell donation"
                  },
+                "healthcare/counselling": {
+                    "name": "Counselling Center",
+                    "terms": ""
+                },
                  "healthcare/hospice": {
                      "name": "Hospice",
                      "terms": "terminal,illness"
                  "healthcare/hospice": {
                      "name": "Hospice",
                      "terms": "terminal,illness"
@@ -6145,7 +6726,7 @@
                  },
                  "highway/cycleway/bicycle_foot": {
                      "name": "Cycle & Foot Path",
                  },
                  "highway/cycleway/bicycle_foot": {
                      "name": "Cycle & Foot Path",
-                    "terms": "bicycle and foot path,bike and pedestrian path,green way,greenway,mixed-use trail,multi-use trail,segregated trail"
+                    "terms": "bicycle and foot path,bike and pedestrian path,green way,greenway,mixed-use trail,multi-use trail,segregated trail,rail trail"
                  },
                  "highway/cycleway/crossing/marked": {
                      "name": "Marked Cycle Crossing",
                  },
                  "highway/cycleway/crossing/marked": {
                      "name": "Marked Cycle Crossing",
@@ -6539,6 +7120,10 @@
                      "name": "Farmyard",
                      "terms": "crop,grow,plant"
                  },
                      "name": "Farmyard",
                      "terms": "crop,grow,plant"
                  },
+                "landuse/flowerbed": {
+                    "name": "Flowerbed",
+                    "terms": "floral garden,flower garden"
+                },
                  "landuse/forest": {
                      "name": "Managed Forest",
                      "terms": "cut,forest,forestry,lumber,silviculture,tree"
                  "landuse/forest": {
                      "name": "Managed Forest",
                      "terms": "cut,forest,forestry,lumber,silviculture,tree"
@@ -6595,14 +7180,6 @@
                      "name": "Barracks",
                      "terms": "air force,army,base,fight,force,guard,marine,navy,troop,war"
                  },
                      "name": "Barracks",
                      "terms": "air force,army,base,fight,force,guard,marine,navy,troop,war"
                  },
-                "landuse/military/bunker": {
-                    "name": "Military Bunker",
-                    "terms": "air force,army,base,fight,force,guard,marine,navy,troop,war"
-                },
-                "landuse/military/checkpoint": {
-                    "name": "Checkpoint",
-                    "terms": "air force,army,base,force,guard,marine,navy,troop,war"
-                },
                  "landuse/military/danger_area": {
                      "name": "Danger Area",
                      "terms": "air force,army,base,blast,bomb,explo*,force,guard,mine,marine,navy,troop,war"
                  "landuse/military/danger_area": {
                      "name": "Danger Area",
                      "terms": "air force,army,base,blast,bomb,explo*,force,guard,mine,marine,navy,troop,war"
@@ -6611,18 +7188,10 @@
                      "name": "Naval Base",
                      "terms": "base,fight,force,guard,marine,navy,ship,sub,troop,war"
                  },
                      "name": "Naval Base",
                      "terms": "base,fight,force,guard,marine,navy,ship,sub,troop,war"
                  },
-                "landuse/military/nuclear_explosion_site": {
-                    "name": "Nuclear Explosion Site",
-                    "terms": "atom,blast,bomb,detonat*,nuke,site,test"
-                },
                  "landuse/military/obstacle_course": {
                      "name": "Obstacle Course",
                      "terms": "army,base,force,guard,marine,navy,troop,war"
                  },
                  "landuse/military/obstacle_course": {
                      "name": "Obstacle Course",
                      "terms": "army,base,force,guard,marine,navy,troop,war"
                  },
-                "landuse/military/office": {
-                    "name": "Military Office",
-                    "terms": "air force,army,base,enlist,fight,force,guard,marine,navy,recruit,troop,war"
-                },
                  "landuse/military/range": {
                      "name": "Military Range",
                      "terms": "air force,army,base,fight,fire,force,guard,gun,marine,navy,rifle,shoot*,snip*,train,troop,war"
                  "landuse/military/range": {
                      "name": "Military Range",
                      "terms": "air force,army,base,fight,fire,force,guard,gun,marine,navy,rifle,shoot*,snip*,train,troop,war"
@@ -6723,6 +7292,10 @@
                      "name": "Dog Park",
                      "terms": ""
                  },
                      "name": "Dog Park",
                      "terms": ""
                  },
+                "leisure/escape_game": {
+                    "name": "Escape Room",
+                    "terms": "escape game,escape the room,puzzle room,quest room"
+                },
                  "leisure/firepit": {
                      "name": "Firepit",
                      "terms": "fireplace,campfire"
                  "leisure/firepit": {
                      "name": "Firepit",
                      "terms": "fireplace,campfire"
@@ -7035,6 +7608,10 @@
                      "name": "Bunker Silo",
                      "terms": "Silage,Storage"
                  },
                      "name": "Bunker Silo",
                      "terms": "Silage,Storage"
                  },
+                "man_made/cairn": {
+                    "name": "Cairn",
+                    "terms": "rock pile,stone stack,stone pile,càrn"
+                },
                  "man_made/chimney": {
                      "name": "Chimney",
                      "terms": ""
                  "man_made/chimney": {
                      "name": "Chimney",
                      "terms": ""
@@ -7107,6 +7684,10 @@
                      "name": "Monitoring Station",
                      "terms": "weather,earthquake,seismology,air,gps"
                  },
                      "name": "Monitoring Station",
                      "terms": "weather,earthquake,seismology,air,gps"
                  },
+                "man_made/obelisk": {
+                    "name": "Obelisk",
+                    "terms": ""
+                },
                  "man_made/observatory": {
                      "name": "Observatory",
                      "terms": "astronomical,meteorological"
                  "man_made/observatory": {
                      "name": "Observatory",
                      "terms": "astronomical,meteorological"
@@ -7131,6 +7712,10 @@
                      "name": "Underground Pipeline",
                      "terms": "oil,natural gas,water,sewer,sewage"
                  },
                      "name": "Underground Pipeline",
                      "terms": "oil,natural gas,water,sewer,sewage"
                  },
+                "man_made/pipeline/valve": {
+                    "name": "Pipeline Valve",
+                    "terms": "oil,natural gas,water,sewer,sewage"
+                },
                  "man_made/pumping_station": {
                      "name": "Pumping Station",
                      "terms": ""
                  "man_made/pumping_station": {
                      "name": "Pumping Station",
                      "terms": ""
@@ -7163,6 +7748,10 @@
                      "name": "Survey Point",
                      "terms": "trig point,triangulation pillar,trigonometrical station"
                  },
                      "name": "Survey Point",
                      "terms": "trig point,triangulation pillar,trigonometrical station"
                  },
+                "man_made/torii": {
+                    "name": "Torii",
+                    "terms": "Japanese gate,Shinto shrine"
+                },
                  "man_made/tower": {
                      "name": "Tower",
                      "terms": ""
                  "man_made/tower": {
                      "name": "Tower",
                      "terms": ""
@@ -7231,6 +7820,26 @@
                      "name": "Telecom Manhole",
                      "terms": "cover,phone,hole,telecom,telephone,bt"
                  },
                      "name": "Telecom Manhole",
                      "terms": "cover,phone,hole,telecom,telephone,bt"
                  },
+                "military/bunker": {
+                    "name": "Military Bunker",
+                    "terms": "air force,army,base,fight,force,guard,marine,navy,troop,war"
+                },
+                "military/checkpoint": {
+                    "name": "Checkpoint",
+                    "terms": "air force,army,base,force,guard,marine,navy,troop,war"
+                },
+                "military/nuclear_explosion_site": {
+                    "name": "Nuclear Explosion Site",
+                    "terms": "atom,blast,bomb,detonat*,nuke,site,test"
+                },
+                "military/office": {
+                    "name": "Military Office",
+                    "terms": "air force,army,base,enlist,fight,force,guard,marine,navy,recruit,troop,war"
+                },
+                "military/trench": {
+                    "name": "Military Trench",
+                    "terms": "dugout,firestep,fox hole,infantry trench,war trench"
+                },
                  "natural/bare_rock": {
                      "name": "Bare Rock",
                      "terms": "rock"
                  "natural/bare_rock": {
                      "name": "Bare Rock",
                      "terms": "rock"
@@ -7427,6 +8036,10 @@
                      "name": "Nonprofit Organization Office",
                      "terms": "association,non-profit,nonprofit,organization,society"
                  },
                      "name": "Nonprofit Organization Office",
                      "terms": "association,non-profit,nonprofit,organization,society"
                  },
+                "office/bail_bond_agent": {
+                    "name": "Bail Bond Agent",
+                    "terms": "bail bond dealer,bail bond man,bail bondsman,bail bondsperson"
+                },
                  "office/charity": {
                      "name": "Charity Office",
                      "terms": "charitable organization"
                  "office/charity": {
                      "name": "Charity Office",
                      "terms": "charitable organization"
@@ -7536,7 +8149,7 @@
                      "terms": "clerk,deeds,estate,signature,wills"
                  },
                  "office/political_party": {
                      "terms": "clerk,deeds,estate,signature,wills"
                  },
                  "office/political_party": {
-                    "name": "Political Party",
+                    "name": "Political Party Office",
                      "terms": ""
                  },
                  "office/private_investigator": {
                      "terms": ""
                  },
                  "office/private_investigator": {
@@ -7565,7 +8178,7 @@
                  },
                  "office/telecommunication": {
                      "name": "Telecom Office",
                  },
                  "office/telecommunication": {
                      "name": "Telecom Office",
-                    "terms": "communication,internet,phone,voice"
+                    "terms": "communication,internet service provider,isp,network,telephone,voice"
                  },
                  "office/therapist": {
                      "name": "Therapist Office",
                  },
                  "office/therapist": {
                      "name": "Therapist Office",
@@ -7731,6 +8344,10 @@
                      "name": "Point",
                      "terms": "node,other,vertex,vertices"
                  },
                      "name": "Point",
                      "terms": "node,other,vertex,vertices"
                  },
+                "polling_station": {
+                    "name": "Temporary Polling Place",
+                    "terms": "ballot box,ballot drop,democracy,elections,polling place,vote,voting booth,voting machine"
+                },
                  "power/sub_station": {
                      "name": "Substation",
                      "terms": ""
                  "power/sub_station": {
                      "name": "Substation",
                      "terms": ""
@@ -7761,7 +8378,7 @@
                  },
                  "power/line": {
                      "name": "Power Line",
                  },
                  "power/line": {
                      "name": "Power Line",
-                    "terms": ""
+                    "terms": "electric power transmission line,high voltage line,high tension line"
                  },
                  "power/minor_line": {
                      "name": "Minor Power Line",
                  },
                  "power/minor_line": {
                      "name": "Minor Power Line",
@@ -7823,10 +8440,6 @@
                      "name": "Train Stop / Platform",
                      "terms": "platform,public transit,public transportation,rail,track,train,transit,transportation"
                  },
                      "name": "Train Stop / Platform",
                      "terms": "platform,public transit,public transportation,rail,track,train,transit,transportation"
                  },
-                "public_transport/platform/tram_point": {
-                    "name": "Tram Stop / Platform",
-                    "terms": "electric,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation"
-                },
                  "public_transport/platform/aerialway": {
                      "name": "Aerialway Platform",
                      "terms": "aerialway,cable car,platform,public transit,public transportation,transit,transportation"
                  "public_transport/platform/aerialway": {
                      "name": "Aerialway Platform",
                      "terms": "aerialway,cable car,platform,public transit,public transportation,transit,transportation"
@@ -7859,6 +8472,10 @@
                      "name": "Train Platform",
                      "terms": "platform,public transit,public transportation,rail,track,train,transit,transportation"
                  },
                      "name": "Train Platform",
                      "terms": "platform,public transit,public transportation,rail,track,train,transit,transportation"
                  },
+                "public_transport/platform/tram_point": {
+                    "name": "Tram Stop / Platform",
+                    "terms": "electric,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation"
+                },
                  "public_transport/platform/tram": {
                      "name": "Tram Platform",
                      "terms": "electric,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation"
                  "public_transport/platform/tram": {
                      "name": "Tram Platform",
                      "terms": "electric,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation"
@@ -8065,7 +8682,7 @@
                  },
                  "route/ferry": {
                      "name": "Ferry Route",
                  },
                  "route/ferry": {
                      "name": "Ferry Route",
-                    "terms": ""
+                    "terms": "boat,merchant vessel,ship,water bus,water shuttle,water taxi"
                  },
                  "seamark/beacon_isolated_danger": {
                      "name": "Danger Beacon",
                  },
                  "seamark/beacon_isolated_danger": {
                      "name": "Danger Beacon",
@@ -8331,6 +8948,10 @@
                      "name": "Produce Stand",
                      "terms": "farm shop,farm stand"
                  },
                      "name": "Produce Stand",
                      "terms": "farm shop,farm stand"
                  },
+                "shop/fashion_accessories": {
+                    "name": "Fashion Accessories Store",
+                    "terms": "bag,cologne,fragrance,hat,jewellery,purfume,purse,scarf,sunglasses,umbrella,wallet,watch"
+                },
                  "shop/fireplace": {
                      "name": "Fireplace Store",
                      "terms": "fireplace,stove,masonry heater"
                  "shop/fireplace": {
                      "name": "Fireplace Store",
                      "terms": "fireplace,stove,masonry heater"
@@ -8415,6 +9036,10 @@
                      "name": "Hifi Store",
                      "terms": "audio,hi-fi,high fidelity,stereo,video"
                  },
                      "name": "Hifi Store",
                      "terms": "audio,hi-fi,high fidelity,stereo,video"
                  },
+                "shop/hobby": {
+                    "name": "Hobby Shop",
+                    "terms": "manga,figurine,model"
+                },
                  "shop/houseware": {
                      "name": "Houseware Store",
                      "terms": "home,household,kitchenware"
                  "shop/houseware": {
                      "name": "Houseware Store",
                      "terms": "home,household,kitchenware"
@@ -8475,6 +9100,10 @@
                      "name": "Medical Supply Store",
                      "terms": ""
                  },
                      "name": "Medical Supply Store",
                      "terms": ""
                  },
+                "shop/military_surplus": {
+                    "name": "Military Surplus Store",
+                    "terms": "armor,army-navy store,army surplus,navy surplus,tactical gear,war surplus shop,weapons"
+                },
                  "shop/mobile_phone": {
                      "name": "Mobile Phone Store",
                      "terms": ""
                  "shop/mobile_phone": {
                      "name": "Mobile Phone Store",
                      "terms": ""
@@ -8505,7 +9134,7 @@
                  },
                  "shop/nutrition_supplements": {
                      "name": "Nutrition Supplements Store",
                  },
                  "shop/nutrition_supplements": {
                      "name": "Nutrition Supplements Store",
-                    "terms": ""
+                    "terms": "health,supplement,vitamin"
                  },
                  "shop/optician": {
                      "name": "Optician",
                  },
                  "shop/optician": {
                      "name": "Optician",
@@ -8541,7 +9170,7 @@
                  },
                  "shop/perfumery": {
                      "name": "Perfume Store",
                  },
                  "shop/perfumery": {
                      "name": "Perfume Store",
-                    "terms": ""
+                    "terms": "cologne,fragrance,purfume"
                  },
                  "shop/pet_grooming": {
                      "name": "Pet Grooming Store",
                  },
                  "shop/pet_grooming": {
                      "name": "Pet Grooming Store",
@@ -8555,9 +9184,13 @@
                      "name": "Photography Store",
                      "terms": "camera,film"
                  },
                      "name": "Photography Store",
                      "terms": "camera,film"
                  },
+                "shop/printer_ink": {
+                    "name": "Printer Ink Store",
+                    "terms": "copier ink,fax ink,ink cartridges,toner"
+                },
                  "shop/pyrotechnics": {
                      "name": "Fireworks Store",
                  "shop/pyrotechnics": {
                      "name": "Fireworks Store",
-                    "terms": ""
+                    "terms": "fireworks"
                  },
                  "shop/radiotechnics": {
                      "name": "Radio/Electronic Component Store",
                  },
                  "shop/radiotechnics": {
                      "name": "Radio/Electronic Component Store",
@@ -8567,6 +9200,10 @@
                      "name": "Religious Store",
                      "terms": ""
                  },
                      "name": "Religious Store",
                      "terms": ""
                  },
+                "shop/rental": {
+                    "name": "Rental Shop",
+                    "terms": ""
+                },
                  "shop/scuba_diving": {
                      "name": "Scuba Diving Shop",
                      "terms": "diving,scuba"
                  "shop/scuba_diving": {
                      "name": "Scuba Diving Shop",
                      "terms": "diving,scuba"
@@ -8603,6 +9240,10 @@
                      "name": "Supermarket",
                      "terms": "grocery,store,shop"
                  },
                      "name": "Supermarket",
                      "terms": "grocery,store,shop"
                  },
+                "shop/swimming_pool": {
+                    "name": "Pool Supply Store",
+                    "terms": "hot tub equipment store,hot tub maintenance store,hot tub supply store,pool shop,pool store,swimming pool equipment store,swimming pool installation store,swimming pool maintenance store,swimming pool supply shop"
+                },
                  "shop/tailor": {
                      "name": "Tailor",
                      "terms": "clothes,suit"
                  "shop/tailor": {
                      "name": "Tailor",
                      "terms": "clothes,suit"
@@ -8687,10 +9328,6 @@
                      "name": "Wine Shop",
                      "terms": ""
                  },
                      "name": "Wine Shop",
                      "terms": ""
                  },
-                "tactile_paving": {
-                    "name": "Tactile Paving",
-                    "terms": "blind path,detectable warning surfaces,tactile ground surface indicators,tactile walking surface indicators,truncated domes,visually impaired path"
-                },
                  "telecom/data_center": {
                      "name": "Data Center",
                      "terms": "computer systems storage,information technology,server farm,the cloud,telecommunications"
                  "telecom/data_center": {
                      "name": "Data Center",
                      "terms": "computer systems storage,information technology,server farm,the cloud,telecommunications"
@@ -8739,6 +9376,10 @@
                      "name": "Tourist Attraction",
                      "terms": ""
                  },
                      "name": "Tourist Attraction",
                      "terms": ""
                  },
+                "tourism/camp_pitch": {
+                    "name": "Camp Pitch",
+                    "terms": "tent,rv"
+                },
                  "tourism/camp_site": {
                      "name": "Campground",
                      "terms": "tent,rv"
                  "tourism/camp_site": {
                      "name": "Campground",
                      "terms": "tent,rv"
@@ -9109,7 +9750,7 @@
                  },
                  "waterway/weir": {
                      "name": "Weir",
                  },
                  "waterway/weir": {
                      "name": "Weir",
-                    "terms": ""
+                    "terms": "low-head dam,low-rise dam,wier"
                  }
              }
          },
                  }
              }
          },
@@ -9148,34 +9789,6 @@
                  "description": "Satellite and aerial imagery.",
                  "name": "Bing aerial imagery"
              },
                  "description": "Satellite and aerial imagery.",
                  "name": "Bing aerial imagery"
              },
-            "DigitalGlobe-Premium": {
-                "attribution": {
-                    "text": "Terms & Feedback"
-                },
-                "description": "DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with select regions filled with +Vivid or custom area of interest imagery, 50cm resolution or better, and refreshed more frequently with ongoing updates.",
-                "name": "DigitalGlobe Premium Imagery"
-            },
-            "DigitalGlobe-Premium-vintage": {
-                "attribution": {
-                    "text": "Terms & Feedback"
-                },
-                "description": "Imagery boundaries and capture dates. Labels appear at zoom level 13 and higher.",
-                "name": "DigitalGlobe Premium Imagery Vintage"
-            },
-            "DigitalGlobe-Standard": {
-                "attribution": {
-                    "text": "Terms & Feedback"
-                },
-                "description": "DigitalGlobe-Standard is a curated set of imagery covering 86% of the earth’s landmass, with 30-60cm resolution where available, backfilled by Landsat. Average age is 2.31 years, with some areas updated 2x per year.",
-                "name": "DigitalGlobe Standard Imagery"
-            },
-            "DigitalGlobe-Standard-vintage": {
-                "attribution": {
-                    "text": "Terms & Feedback"
-                },
-                "description": "Imagery boundaries and capture dates. Labels appear at zoom level 13 and higher.",
-                "name": "DigitalGlobe Standard Imagery Vintage"
-            },
              "EOXAT2018CLOUDLESS": {
                  "attribution": {
                      "text": "Sentinel-2 cloudless - https://s2maps.eu by EOX IT Services GmbH (Contains modified Copernicus Sentinel data 2017 & 2018)"
              "EOXAT2018CLOUDLESS": {
                  "attribution": {
                      "text": "Sentinel-2 cloudless - https://s2maps.eu by EOX IT Services GmbH (Contains modified Copernicus Sentinel data 2017 & 2018)"
@@ -9367,6 +9980,27 @@
                  "description": "Orthofoto layer provided by basemap.at. \"Successor\" of geoimage.at imagery.",
                  "name": "basemap.at Orthofoto"
              },
                  "description": "Orthofoto layer provided by basemap.at. \"Successor\" of geoimage.at imagery.",
                  "name": "basemap.at Orthofoto"
              },
+            "basemap.at-overlay": {
+                "attribution": {
+                    "text": "basemap.at"
+                },
+                "description": "Annotation overlay provided by basemap.at.",
+                "name": "basemap.at Overlay"
+            },
+            "basemap.at-surface": {
+                "attribution": {
+                    "text": "basemap.at"
+                },
+                "description": "Surface layer provided by basemap.at.",
+                "name": "basemap.at Surface"
+            },
+            "basemap.at-terrain": {
+                "attribution": {
+                    "text": "basemap.at"
+                },
+                "description": "Terrain layer provided by basemap.at.",
+                "name": "basemap.at Terrain"
+            },
              "eufar-balaton": {
                  "attribution": {
                      "text": "EUFAR Balaton ortofotó 2010"
              "eufar-balaton": {
                  "attribution": {
                      "text": "EUFAR Balaton ortofotó 2010"
@@ -9801,6 +10435,10 @@
                  "description": "YouthMappers chapter at University of Nigeria, Enugu Campus",
                  "extendedDescription": "The LionMappersTeam(LMT)Enugu Campus is an affiliate of YouthMappers Network, with the sole aim of providing members the opportunity to learn and improve their skills in the field of Geoinformatics and to create open geographic data and analysis that addresses locally defined challenges globally. It is a team of volunteers for Crowdsourced Mapping and Geographic Information provision using Openstreetmap, Citizen Science and other Geospatial Technology for research, training and response to resilient community challenges. We are involved in Web-Cartography, GIS and Remote Sensing Applications and ResearchWe are passionate about Volunteered Geographic Information.Paticipatory GIS and Citizen Science.Our major activities include online crowdsourced-Cartography, Field Mapping ,Training workshops and outreaches to High School as well as Humanitarian/Disaster Response Mapping."
              },
                  "description": "YouthMappers chapter at University of Nigeria, Enugu Campus",
                  "extendedDescription": "The LionMappersTeam(LMT)Enugu Campus is an affiliate of YouthMappers Network, with the sole aim of providing members the opportunity to learn and improve their skills in the field of Geoinformatics and to create open geographic data and analysis that addresses locally defined challenges globally. It is a team of volunteers for Crowdsourced Mapping and Geographic Information provision using Openstreetmap, Citizen Science and other Geospatial Technology for research, training and response to resilient community challenges. We are involved in Web-Cartography, GIS and Remote Sensing Applications and ResearchWe are passionate about Volunteered Geographic Information.Paticipatory GIS and Citizen Science.Our major activities include online crowdsourced-Cartography, Field Mapping ,Training workshops and outreaches to High School as well as Humanitarian/Disaster Response Mapping."
              },
+            "osm-africa-telegram": {
+                "name": "OpenStreetMap Africa Telegram",
+                "description": "OpenStreetMap Telegram for Africa"
+            },
              "ym-Insititue-d-Enseignement-Superieur-de-Ruhengeri": {
                  "name": "YouthMappers at INES Ruhengeri",
                  "description": "YouthMappers chapter at Insititue d' Enseignement Superieur de Ruhengeri",
              "ym-Insititue-d-Enseignement-Superieur-de-Ruhengeri": {
                  "name": "YouthMappers at INES Ruhengeri",
                  "description": "YouthMappers chapter at Insititue d' Enseignement Superieur de Ruhengeri",
@@ -9927,6 +10565,10 @@
                  "description": "YouthMappers chapter at University of Zimbabwe",
                  "extendedDescription": "UzMappersTeam Zimbabwe is a team of Volunteers using OpenStreetMap for Open Data Mapping and Humanitarian Disaster response mapping .The team empowers its members with open source geospatial technology skills."
              },
                  "description": "YouthMappers chapter at University of Zimbabwe",
                  "extendedDescription": "UzMappersTeam Zimbabwe is a team of Volunteers using OpenStreetMap for Open Data Mapping and Humanitarian Disaster response mapping .The team empowers its members with open source geospatial technology skills."
              },
+            "osm-afghanistan-facebook": {
+                "name": "OpenStreetMap Afghanistan",
+                "description": "Improve OpenStreetMap in Afghanistan"
+            },
              "OSM-BGD-facebook": {
                  "name": "OpenStreetMap Bangladesh",
                  "description": "Improve OpenStreetMap in Bangladesh",
              "OSM-BGD-facebook": {
                  "name": "OpenStreetMap Bangladesh",
                  "description": "Improve OpenStreetMap in Bangladesh",
@@ -10462,6 +11104,10 @@
                  "name": "OpenStreetMap Kosovo on Telegram",
                  "description": "Semi-official all-Kosovo Telegram public group. We welcome all mappers from anywhere in any language."
              },
                  "name": "OpenStreetMap Kosovo on Telegram",
                  "description": "Semi-official all-Kosovo Telegram public group. We welcome all mappers from anywhere in any language."
              },
+            "lu-mailinglist": {
+                "name": "Talk-lu Mailing List",
+                "description": "Official mailing list for the Luxembourgish OSM community"
+            },
              "ym-Universit-Mohammed-V-Rabat": {
                  "name": "Brahmapoutre at Rabat",
                  "description": "YouthMappers chapter at Université Mohammed V Rabat",
              "ym-Universit-Mohammed-V-Rabat": {
                  "name": "Brahmapoutre at Rabat",
                  "description": "YouthMappers chapter at Université Mohammed V Rabat",
@@ -10491,6 +11137,14 @@
                  "name": "OpenStreetMap Poland Forum",
                  "description": "Forum of Polish OpenStreetMap community"
              },
                  "name": "OpenStreetMap Poland Forum",
                  "description": "Forum of Polish OpenStreetMap community"
              },
+            "pt-mailinglist": {
+                "name": "Talk-pt Mailing List",
+                "description": "Talk-pt is the official mailing list for the Portuguese OSM community"
+            },
+            "pt-telegram": {
+                "name": "OpenStreetMap Portugal no Telegram",
+                "description": "Telegram Group of the Portuguese OpenStreetMap community {url}"
+            },
              "si-forum": {
                  "name": "OpenStreetMap Slovenia Forum",
                  "description": "Forum of OpenStreetMap community in Slovenia"
              "si-forum": {
                  "name": "OpenStreetMap Slovenia Forum",
                  "description": "Forum of OpenStreetMap community in Slovenia"
@@ -10608,10 +11262,26 @@
                  "description": "YouthMappers chapter at University of the West Indies, Mona Campus",
                  "extendedDescription": "The UWI, Mona Campus Library engages in public, outreach and special projects. This will allow our library the means to be a catalyst for spatial literacy and advocate for spatial data sharing and access to Jamaican and Caribbean interests. We have disaster relief and communication needs and   extensive earth science and geo-hazards needs to better serve our campus and community. Specifically, we hace a Science Library to showcase such to all faculty and students."
              },
                  "description": "YouthMappers chapter at University of the West Indies, Mona Campus",
                  "extendedDescription": "The UWI, Mona Campus Library engages in public, outreach and special projects. This will allow our library the means to be a catalyst for spatial literacy and advocate for spatial data sharing and access to Jamaican and Caribbean interests. We have disaster relief and communication needs and   extensive earth science and geo-hazards needs to better serve our campus and community. Specifically, we hace a Science Library to showcase such to all faculty and students."
              },
-            "OSM-NI-telegram": {
+            "ni-facebook": {
+                "name": "OpenStreetMap NI Community",
+                "description": "Mappers and OpenStreetMap on Facebook in Nicaragua"
+            },
+            "ni-mailinglist": {
+                "name": "Talk-ni Mailing List",
+                "description": "Talk-ni is the official mailing list for the Nicaraguan OSM community"
+            },
+            "ni-telegram": {
                  "name": "OSM Nicaragua on Telegram",
                  "description": "OpenStreetMap Nicaragua Telegram chat"
              },
                  "name": "OSM Nicaragua on Telegram",
                  "description": "OpenStreetMap Nicaragua Telegram chat"
              },
+            "ni-twitter": {
+                "name": "OpenStreetMap Nicaragua Twitter",
+                "description": "OSM Nicaragua on Twitter: @osm_ni"
+            },
+            "osm-ni": {
+                "name": "MapaNica.net",
+                "description": "Provide OSM services and information for the local community in Nicaragua"
+            },
              "ym-Universidad-Nacional-de-Ingenieria": {
                  "name": "Yeka Street MGA",
                  "description": "YouthMappers chapter at Universidad Nacional de Ingenieria",
              "ym-Universidad-Nacional-de-Ingenieria": {
                  "name": "Yeka Street MGA",
                  "description": "YouthMappers chapter at Universidad Nacional de Ingenieria",
@@ -10980,14 +11650,22 @@
                  "name": "Geography Club",
                  "description": "YouthMappers chapter at Western Michigan University"
              },
                  "name": "Geography Club",
                  "description": "YouthMappers chapter at Western Michigan University"
              },
-            "Maptime-Australia-Slack": {
-                "name": "Maptime Australia Slack",
-                "description": "Sign up at {signupUrl}"
+            "geogeeks_perth_meetup": {
+                "name": "GeoGeeks Perth Meetup",
+                "description": "Perth-based meetup group for people interested in mapping, geospatial data, and open source. We'll be working on anything that involves a sense of place."
              },
              "talk-au": {
                  "name": "Talk-au Mailing List",
                  "description": "Place for Aussie mappers to chat"
              },
              },
              "talk-au": {
                  "name": "Talk-au Mailing List",
                  "description": "Place for Aussie mappers to chat"
              },
+            "Maptime-Oceania-Slack": {
+                "name": "Maptime Oceania Slack",
+                "description": "Sign up at {signupUrl}"
+            },
+            "talk-nz": {
+                "name": "Talk-nz Mailing List",
+                "description": "New Zealand's OSM community talk"
+            },
              "OSM-AR-facebook": {
                  "name": "OpenStreetMap Argentina Facebook",
                  "description": "Join the OpenStreetMap Argentina community on Facebook",
              "OSM-AR-facebook": {
                  "name": "OpenStreetMap Argentina Facebook",
                  "description": "Join the OpenStreetMap Argentina community on Facebook",
@@ -11032,6 +11710,10 @@
                  "description": "Join the OpenStreetMap Brasília community on Telegram",
                  "extendedDescription": "Join the community to learn more about OpenStreetMap, ask questions or participate in our meetings. Everyone is welcome!"
              },
                  "description": "Join the OpenStreetMap Brasília community on Telegram",
                  "extendedDescription": "Join the community to learn more about OpenStreetMap, ask questions or participate in our meetings. Everyone is welcome!"
              },
+            "OSM-br-discord": {
+                "name": "OpenStreetMap Brasil Discord",
+                "description": "Join the OpenStreetMap Brasil community on Discord"
+            },
              "OSM-br-mailinglist": {
                  "name": "Talk-br Mailing List",
                  "description": "A mailing list to discuss OpenStreetMap in Brazil"
              "OSM-br-mailinglist": {
                  "name": "Talk-br Mailing List",
                  "description": "A mailing list to discuss OpenStreetMap in Brazil"
@@ -11156,6 +11838,31 @@
                  "name": "OpenStreetMap Peru",
                  "description": "News and resources for the OpenStreetMap Peru community"
              },
                  "name": "OpenStreetMap Peru",
                  "description": "News and resources for the OpenStreetMap Peru community"
              },
+            "uy-forum": {
+                "name": "OpenStreetMap UY forum",
+                "description": "OpenStreetMap Uruguay web forum"
+            },
+            "uy-irc": {
+                "name": "OpenStreetMap Uruguay on IRC",
+                "description": "Join #osmuruguay on irc.freenode.org (port 6667)",
+                "extendedDescription": "Join #osmuruguay on irc.freenode.org"
+            },
+            "uy-mailinglist": {
+                "name": "Talk-uy Mailing List",
+                "description": "Talk-uy is the official mailing list for the Uruguayan OSM community"
+            },
+            "ve-forum": {
+                "name": "OpenStreetMap VE Forum",
+                "description": "OpenStreetMap Venezuela web forum"
+            },
+            "ve-mailinglist": {
+                "name": "Talk-ve Mailing List",
+                "description": "Talk-ve is the official mailing list for the Venezuelan OSM community"
+            },
+            "ve-telegram": {
+                "name": "OpenStreetMap Venezuela Telegram",
+                "description": "Join the OpenStreetMap Venezuela community on Telegram"
+            },
              "LATAM-Facebook": {
                  "name": "OpenStreetMap Latam Facebook",
                  "description": "OpenStreetMap Latam on Facebook"
              "LATAM-Facebook": {
                  "name": "OpenStreetMap Latam Facebook",
                  "description": "OpenStreetMap Latam on Facebook"