diff --git a/data/presets/presets.json b/data/presets/presets.json
index 4453e0d09..ec74f4c7d 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -153,15 +153,17 @@
                 "address"
             ],
             "geometry": [
-                "point"
+                "point",
+                "vertex",
+                "area"
             ],
             "tags": {
                 "addr:housenumber": "*"
             },
             "addTags": {},
             "removeTags": {},
-            "matchScore": 0.2,
-            "name": "Address"
+            "name": "Address",
+            "matchScore": 0.3
         },
         "advertising/billboard": {
             "fields": [
@@ -3466,16 +3468,16 @@
             "name": "Animal Watering Place"
         },
         "area": {
-            "name": "Area",
             "fields": [
                 "name"
             ],
+            "geometry": [
+                "area"
+            ],
             "tags": {
                 "area": "yes"
             },
-            "geometry": [
-                "area"
-            ],
+            "name": "Area",
             "matchScore": 0.1
         },
         "area/highway": {
@@ -9689,14 +9691,14 @@
             "name": "Water Park"
         },
         "line": {
-            "name": "Line",
             "fields": [
                 "name"
             ],
-            "tags": {},
             "geometry": [
                 "line"
             ],
+            "tags": {},
+            "name": "Line",
             "matchScore": 0.1
         },
         "man_made": {
@@ -11464,14 +11466,14 @@
             "name": "Village"
         },
         "point": {
-            "name": "Point",
             "fields": [
                 "name"
             ],
-            "tags": {},
             "geometry": [
                 "point"
             ],
+            "tags": {},
+            "name": "Point",
             "matchScore": 0.1
         },
         "power/sub_station": {
@@ -15741,14 +15743,14 @@
             "name": "Waterway"
         },
         "vertex": {
-            "name": "Other",
-            "tags": {},
             "fields": [
                 "name"
             ],
             "geometry": [
                 "vertex"
             ],
+            "tags": {},
+            "name": "Other",
             "matchScore": 0.1
         },
         "waterway/boatyard": {
diff --git a/data/presets/presets/address.json b/data/presets/presets/address.json
index 229e704a0..f65894b55 100644
--- a/data/presets/presets/address.json
+++ b/data/presets/presets/address.json
@@ -3,13 +3,15 @@
         "address"
     ],
     "geometry": [
-        "point"
+        "point",
+        "vertex",
+        "area"
     ],
     "tags": {
         "addr:housenumber": "*"
     },
     "addTags": {},
     "removeTags": {},
-    "matchScore": 0.2,
-    "name": "Address"
-}
\ No newline at end of file
+    "name": "Address",
+    "matchScore": 0.3
+}
diff --git a/data/presets/presets/area.json b/data/presets/presets/area.json
index a3b1c6fa5..ed2a9f379 100644
--- a/data/presets/presets/area.json
+++ b/data/presets/presets/area.json
@@ -1,11 +1,13 @@
 {
-    "name": "Area",
     "fields": [
         "name"
     ],
+    "geometry": [
+        "area"
+    ],
     "tags": {
         "area": "yes"
     },
-    "geometry": ["area"],
+    "name": "Area",
     "matchScore": 0.1
 }
diff --git a/data/presets/presets/line.json b/data/presets/presets/line.json
index 47872d846..d2339d4c8 100644
--- a/data/presets/presets/line.json
+++ b/data/presets/presets/line.json
@@ -1,9 +1,11 @@
 {
-    "name": "Line",
     "fields": [
         "name"
     ],
+    "geometry": [
+        "line"
+    ],
     "tags": {},
-    "geometry": ["line"],
+    "name": "Line",
     "matchScore": 0.1
 }
diff --git a/data/presets/presets/point.json b/data/presets/presets/point.json
index 331b0d7ac..3a74326a2 100644
--- a/data/presets/presets/point.json
+++ b/data/presets/presets/point.json
@@ -1,9 +1,11 @@
 {
-    "name": "Point",
     "fields": [
         "name"
     ],
+    "geometry": [
+        "point"
+    ],
     "tags": {},
-    "geometry": ["point"],
+    "name": "Point",
     "matchScore": 0.1
 }
diff --git a/data/presets/presets/relation.json b/data/presets/presets/relation.json
index ca2ffd803..f3fee68c6 100644
--- a/data/presets/presets/relation.json
+++ b/data/presets/presets/relation.json
@@ -1,10 +1,12 @@
 {
-    "name": "Relation",
     "icon": "relation",
-    "tags": {},
-    "geometry": ["relation"],
     "fields": [
         "name",
         "relation"
-    ]
+    ],
+    "geometry": [
+        "relation"
+    ],
+    "tags": {},
+    "name": "Relation"
 }
diff --git a/data/presets/presets/vertex.json b/data/presets/presets/vertex.json
index b1fd4fb81..f49857d8c 100644
--- a/data/presets/presets/vertex.json
+++ b/data/presets/presets/vertex.json
@@ -1,9 +1,11 @@
 {
-    "name": "Other",
-    "tags": {},
     "fields": [
         "name"
     ],
-    "geometry": ["vertex"],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {},
+    "name": "Other",
     "matchScore": 0.1
 }