diff --git a/data/address-formats.json b/data/address-formats.json
index 4a803cecd..e31991253 100644
--- a/data/address-formats.json
+++ b/data/address-formats.json
@@ -33,5 +33,9 @@
     {
         "countryCodes": ["ca"],
         "format": [["housenumber", "street"], ["city", "province", "postcode"]]
+    },
+    {
+        "countryCodes": ["tw"],
+        "format": [["postcode", "city", "district"], ["place", "street"], ["housenumber", "floor"]]
     }
 ]
diff --git a/data/presets.yaml b/data/presets.yaml
index d33952d31..ecad14d1c 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 c1fa3cd2e..da46ea21f 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": {
diff --git a/modules/core/connection.js b/modules/core/connection.js
index 741163c5b..c3a312867 100644
--- a/modules/core/connection.js
+++ b/modules/core/connection.js
@@ -280,7 +280,7 @@ export function Connection(useHttps) {
                 method: 'PUT',
                 path: '/api/0.6/changeset/create',
                 options: { header: { 'Content-Type': 'text/xml' } },
-                content: JXON.stringify(connection.changesetJXON(connection.changesetTags(comment, imageryUsed)))
+                content: JXON.stringify(connection.changesetJXON(connection.changesetTags(version, comment, imageryUsed)))
             }, function(err, changeset_id) {
                 if (err) return callback(err);
                 oauth.xhr({
diff --git a/package.json b/package.json
index 1578e5739..f46491078 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "phantomjs-prebuilt": "2.1.7",
     "request": "~2.73.0",
     "rollup": "0.34.1",
-    "rollup-plugin-commonjs": "3.3.0",
+    "rollup-plugin-commonjs": "3.3.1",
     "rollup-plugin-node-resolve": "1.7.1",
     "sinon": "1.17.4",
     "sinon-chai": "2.8.0",