diff --git a/data/address-formats.json b/data/address-formats.json
index 8444d11d65..ea64be59ed 100644
--- a/data/address-formats.json
+++ b/data/address-formats.json
@@ -2,7 +2,7 @@
     "dataAddressFormats": [
         {
             "format": [
-                ["housenumber", "street"],
+                ["housenumber", "street", "unit"],
                 ["city", "postcode"]
             ]
         },
@@ -10,7 +10,7 @@
             "countryCodes": ["gb"],
             "format": [
                 ["housename"],
-                ["housenumber", "street"],
+                ["housenumber", "street", "unit"],
                 ["city", "postcode"]
             ]
         },
@@ -18,7 +18,7 @@
             "countryCodes": ["ie"],
             "format": [
                 ["housename"],
-                ["housenumber", "street"],
+                ["housenumber", "street", "unit"],
                 ["city"],
                 ["postcode"]
             ]
@@ -31,21 +31,21 @@
                 "pt", "se", "si", "sk", "sm", "va"
             ],
             "format": [
-                ["street", "housenumber"],
+                ["unit","street", "housenumber"],
                 ["postcode", "city"]
             ]
         },
         {
             "countryCodes": ["fr", "lu", "mo"],
             "format": [
-                ["housenumber", "street"],
+                ["unit","housenumber", "street"],
                 ["postcode", "city"]
             ]
         },
         {
             "countryCodes": ["br"],
             "format": [
-                ["street"],
+                ["street","unit"],
                 ["housenumber", "suburb"],
                 ["city", "postcode"]
             ]
@@ -53,7 +53,7 @@
         {
             "countryCodes": ["vn"],
             "format": [
-                ["housenumber", "street"],
+                ["housenumber", "street","unit"],
                 ["subdistrict"],
                 ["district"],
                 ["city"],
@@ -61,17 +61,17 @@
             ]
         },
         {
-            "countryCodes": ["us"],
+            "countryCodes": ["au","ca"],
             "format": [
-                ["housenumber", "street"],
-                ["city", "state", "postcode"]
+                ["housenumber", "street", "unit"],
+                ["city", "province", "postcode"]
             ]
         },
         {
-            "countryCodes": ["ca"],
+            "countryCodes": ["us"],
             "format": [
-                ["housenumber", "street"],
-                ["city", "province", "postcode"]
+                ["housenumber", "street", "unit"],
+                ["city", "state", "postcode"]
             ]
         },
         {
@@ -79,7 +79,7 @@
             "format": [
                 ["postcode", "city", "district"],
                 ["place", "street"],
-                ["housenumber", "floor"]
+                ["housenumber", "floor","unit"]
             ]
         },
         {
@@ -107,7 +107,7 @@
             "countryCodes": ["tr"],
             "format": [
                 ["neighbourhood"],
-                ["street", "housenumber"],
+                ["street", "housenumber", "unit"],
                 ["postcode", "district", "city"]
             ]
         },
@@ -115,14 +115,14 @@
             "countryCodes": ["ua"],
             "format": [
                 ["housenumber", "postcode"],
-                ["street"]
+                ["street", "unit"]
             ]
         },
         {
             "countryCodes": ["cn"],
             "format": [
                 ["postcode", "province"],
-                ["city"],
+                ["city", "unit"],
                 ["district"],
                 ["street", "housenumber"]
             ]
diff --git a/data/presets.yaml b/data/presets.yaml
index aede647a20..617d37613f 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -84,7 +84,7 @@ en:
         # access=*
         label: Access
       address:
-        # 'addr:block_number=*, addr:city=*, addr:block_number=*, addr:conscriptionnumber=*, addr:county=*, addr:country=*, addr:county=*, addr:district=*, addr:floor=*, addr:hamlet=*, addr:housename=*, addr:housenumber=*, addr:neighbourhood=*, addr:place=*, addr:postcode=*, addr:province=*, addr:quarter=*, addr:state=*, addr:street=*, addr:subdistrict=*, addr:suburb=*'
+        # 'addr:block_number=*, addr:city=*, addr:block_number=*, addr:conscriptionnumber=*, addr:county=*, addr:country=*, addr:county=*, addr:district=*, addr:floor=*, addr:hamlet=*, addr:housename=*, addr:housenumber=*, addr:neighbourhood=*, addr:place=*, addr:postcode=*, addr:province=*, addr:quarter=*, addr:state=*, addr:street=*, addr:subdistrict=*, addr:suburb=*, addr:unit=*'
         label: Address
         placeholders:
           block_number: Block Number
@@ -117,6 +117,7 @@ en:
           subdistrict!vn: Ward/Commune/Townlet
           suburb: Suburb
           suburb!jp: Ward
+          unit: Unit
       admin_level:
         # admin_level=*
         label: Admin Level
@@ -3566,6 +3567,7 @@ en:
       natural/wetland:
         # natural=wetland
         name: Wetland
+        # 'terms: bog,marsh,reedbed,swamp,tidalflat'
         terms: '<translate with synonyms or related terms for ''Wetland'', separated by commas>'
       natural/wood:
         # natural=wood
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 2a0ea2a53e..c0541dc7b2 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -99,7 +99,8 @@
                 "addr:state",
                 "addr:street",
                 "addr:subdistrict",
-                "addr:suburb"
+                "addr:suburb",
+                "addr:unit"
             ],
             "reference": {
                 "key": "addr"
@@ -138,7 +139,8 @@
                     "subdistrict": "Subdistrict",
                     "subdistrict!vn": "Ward/Commune/Townlet",
                     "suburb": "Suburb",
-                    "suburb!jp": "Ward"
+                    "suburb!jp": "Ward",
+                    "unit": "Unit"
                 }
             }
         },
diff --git a/data/presets/fields/address.json b/data/presets/fields/address.json
index 198967c7d8..dacaa71a6d 100644
--- a/data/presets/fields/address.json
+++ b/data/presets/fields/address.json
@@ -21,7 +21,8 @@
         "addr:state",
         "addr:street",
         "addr:subdistrict",
-        "addr:suburb"
+        "addr:suburb",
+        "addr:unit"
     ],
     "reference": {"key": "addr"},
     "icon": "address",
@@ -58,7 +59,8 @@
           "subdistrict": "Subdistrict",
           "subdistrict!vn": "Ward/Commune/Townlet",
           "suburb": "Suburb",
-          "suburb!jp": "Ward"
+          "suburb!jp": "Ward",
+          "unit": "Unit"
         }
     }
 }
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 936001dd77..38e6f8317d 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -9694,7 +9694,13 @@
             "tags": {
                 "natural": "wetland"
             },
-            "terms": [],
+            "terms": [
+                "bog",
+                "marsh",
+                "reedbed",
+                "swamp",
+                "tidalflat"
+            ],
             "name": "Wetland"
         },
         "natural/wood": {
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 618af1d786..477d1ec9a5 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1161,7 +1161,8 @@
                         "subdistrict": "Subdistrict",
                         "subdistrict!vn": "Ward/Commune/Townlet",
                         "suburb": "Suburb",
-                        "suburb!jp": "Ward"
+                        "suburb!jp": "Ward",
+                        "unit": "Unit"
                     }
                 },
                 "admin_level": {
@@ -4218,7 +4219,7 @@
                 },
                 "natural/wetland": {
                     "name": "Wetland",
-                    "terms": ""
+                    "terms": "bog,marsh,reedbed,swamp,tidalflat"
                 },
                 "natural/wood": {
                     "name": "Wood",