diff --git a/data/presets.yaml b/data/presets.yaml
index 3ef38bf74..00185845b 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -80,13 +80,14 @@ en:
         # access=*
         label: Access
       address:
-        # 'addr:housename=*, addr:housenumber=*, addr:conscriptionnumber=*, addr:street=*, addr:city=*, addr:postcode=*, addr:place=*, addr:hamlet=*, addr:suburb=*, addr:subdistrict=*, addr:district=*, addr:province=*, addr:state=*, addr:country=*'
+        # 'addr:city=*, addr:conscriptionnumber=*, addr:country=*, addr:district=*, addr:floor=*, addr:hamlet=*, addr:housename=*, addr:housenumber=*, addr:place=*, addr:postcode=*, addr:province=*, addr:state=*, addr:street=*, addr:subdistrict=*, addr:suburb=*'
         label: Address
         placeholders:
           city: City
           conscriptionnumber: '123'
           country: Country
           district: District
+          floor: Floor
           hamlet: Hamlet
           housename: Housename
           housenumber: '123'
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 1c41e98aa..b5f1c9753 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -79,20 +79,21 @@
     "address": {
         "type": "address",
         "keys": [
+            "addr:city",
+            "addr:conscriptionnumber",
+            "addr:country",
+            "addr:district",
+            "addr:floor",
+            "addr:hamlet",
             "addr:housename",
             "addr:housenumber",
-            "addr:conscriptionnumber",
-            "addr:street",
-            "addr:city",
-            "addr:postcode",
             "addr:place",
-            "addr:hamlet",
-            "addr:suburb",
-            "addr:subdistrict",
-            "addr:district",
+            "addr:postcode",
             "addr:province",
             "addr:state",
-            "addr:country"
+            "addr:street",
+            "addr:subdistrict",
+            "addr:suburb"
         ],
         "reference": {
             "key": "addr"
@@ -102,20 +103,21 @@
         "label": "Address",
         "strings": {
             "placeholders": {
+                "city": "City",
+                "conscriptionnumber": "123",
+                "country": "Country",
+                "district": "District",
+                "floor": "Floor",
+                "hamlet": "Hamlet",
                 "housename": "Housename",
                 "housenumber": "123",
-                "conscriptionnumber": "123",
-                "street": "Street",
-                "city": "City",
-                "postcode": "Postcode",
                 "place": "Place",
-                "hamlet": "Hamlet",
-                "suburb": "Suburb",
-                "subdistrict": "Subdistrict",
-                "district": "District",
+                "postcode": "Postcode",
                 "province": "Province",
                 "state": "State",
-                "country": "Country"
+                "street": "Street",
+                "subdistrict": "Subdistrict",
+                "suburb": "Suburb"
             }
         }
     },
diff --git a/data/presets/fields/address.json b/data/presets/fields/address.json
index d881bafa1..9d223b744 100644
--- a/data/presets/fields/address.json
+++ b/data/presets/fields/address.json
@@ -1,20 +1,21 @@
 {
     "type": "address",
     "keys": [
+        "addr:city",
+        "addr:conscriptionnumber",
+        "addr:country",
+        "addr:district",
+        "addr:floor",
+        "addr:hamlet",
         "addr:housename",
         "addr:housenumber",
-        "addr:conscriptionnumber",
-        "addr:street",
-        "addr:city",
-        "addr:postcode",
         "addr:place",
-        "addr:hamlet",
-        "addr:suburb",
-        "addr:subdistrict",
-        "addr:district",
+        "addr:postcode",
         "addr:province",
         "addr:state",
-        "addr:country"
+        "addr:street",
+        "addr:subdistrict",
+        "addr:suburb"
     ],
     "reference": {"key": "addr"},
     "icon": "address",
@@ -22,20 +23,21 @@
     "label": "Address",
     "strings": {
         "placeholders": {
+          "city": "City",
+          "conscriptionnumber": "123",
+          "country": "Country",
+          "district": "District",
+          "floor": "Floor",
+          "hamlet": "Hamlet",
           "housename": "Housename",
           "housenumber": "123",
-          "conscriptionnumber": "123",
-          "street": "Street",
-          "city": "City",
-          "postcode": "Postcode",
           "place": "Place",
-          "hamlet": "Hamlet",
-          "suburb": "Suburb",
-          "subdistrict": "Subdistrict",
-          "district": "District",
+          "postcode": "Postcode",
           "province": "Province",
           "state": "State",
-          "country": "Country"
+          "street": "Street",
+          "subdistrict": "Subdistrict",
+          "suburb": "Suburb"
         }
     }
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 62d4297d4..5f88b913b 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -699,20 +699,21 @@
             "address": {
                 "label": "Address",
                 "placeholders": {
+                    "city": "City",
+                    "conscriptionnumber": "123",
+                    "country": "Country",
+                    "district": "District",
+                    "floor": "Floor",
+                    "hamlet": "Hamlet",
                     "housename": "Housename",
                     "housenumber": "123",
-                    "conscriptionnumber": "123",
-                    "street": "Street",
-                    "city": "City",
-                    "postcode": "Postcode",
                     "place": "Place",
-                    "hamlet": "Hamlet",
-                    "suburb": "Suburb",
-                    "subdistrict": "Subdistrict",
-                    "district": "District",
+                    "postcode": "Postcode",
                     "province": "Province",
                     "state": "State",
-                    "country": "Country"
+                    "street": "Street",
+                    "subdistrict": "Subdistrict",
+                    "suburb": "Suburb"
                 }
             },
             "admin_level": {