diff --git a/data/presets/presets.json b/data/presets/presets.json
index fb54e0e68..e3112ad65 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -68,14 +68,6 @@
             "building_area",
             "address"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -115,14 +107,6 @@
             "building_area",
             "address"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -141,14 +125,6 @@
             "capacity",
             "operator"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -166,14 +142,6 @@
             "network",
             "operator"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -192,14 +160,6 @@
             "building_area",
             "address"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -221,14 +181,6 @@
             "building_area",
             "address"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -265,14 +217,6 @@
             "building_area",
             "address"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -291,14 +235,6 @@
             "building_area",
             "address"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -315,14 +251,6 @@
         "fields": [
             "religion"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -340,14 +268,6 @@
             "building_area",
             "address"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -380,14 +300,6 @@
             "building_area",
             "address"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -406,14 +318,6 @@
             "access",
             "address"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -432,14 +336,6 @@
             "building_area",
             "address"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -459,14 +355,6 @@
             "building",
             "address"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -509,14 +397,6 @@
             "building",
             "address"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -559,14 +439,6 @@
             "building",
             "address"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -589,14 +461,6 @@
             "building",
             "address"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -619,14 +483,6 @@
             "building_area",
             "address"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -673,14 +529,6 @@
             "operator",
             "collection_times"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex"
@@ -704,14 +552,6 @@
             "building_area",
             "address"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -730,14 +570,6 @@
             "building_area",
             "address"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -788,14 +620,6 @@
             "building",
             "address"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -829,14 +653,6 @@
             "operator",
             "building"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -854,14 +670,6 @@
             "building_area",
             "address"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -885,14 +693,6 @@
             "operator",
             "address"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
@@ -2061,14 +1861,6 @@
             "building_area",
             "address"
         ],
-        "additional": [
-            "address",
-            "phone",
-            "website",
-            "wikipedia",
-            "elevation",
-            "source"
-        ],
         "geometry": [
             "point",
             "vertex",
diff --git a/data/presets/presets/amenity/bank.json b/data/presets/presets/amenity/bank.json
index eb3ebfaa9..747530f0c 100644
--- a/data/presets/presets/amenity/bank.json
+++ b/data/presets/presets/amenity/bank.json
@@ -6,14 +6,6 @@
         "building_area",
         "address"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -45,4 +37,4 @@
     "tags": {
         "amenity": "bank"
     }
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/bar.json b/data/presets/presets/amenity/bar.json
index a15e3b170..9a074de4e 100644
--- a/data/presets/presets/amenity/bar.json
+++ b/data/presets/presets/amenity/bar.json
@@ -5,14 +5,6 @@
         "building_area",
         "address"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -22,4 +14,4 @@
         "amenity": "bar"
     },
     "terms": []
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/bicycle_parking.json b/data/presets/presets/amenity/bicycle_parking.json
index 8b6d617fb..682716563 100644
--- a/data/presets/presets/amenity/bicycle_parking.json
+++ b/data/presets/presets/amenity/bicycle_parking.json
@@ -6,14 +6,6 @@
         "capacity",
         "operator"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -22,4 +14,4 @@
     "tags": {
         "amenity": "bicycle_parking"
     }
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/bicycle_rental.json b/data/presets/presets/amenity/bicycle_rental.json
index 1f9e74e29..ea1f1c2ac 100644
--- a/data/presets/presets/amenity/bicycle_rental.json
+++ b/data/presets/presets/amenity/bicycle_rental.json
@@ -6,14 +6,6 @@
         "network",
         "operator"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -22,4 +14,4 @@
     "tags": {
         "amenity": "bicycle_rental"
     }
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/cafe.json b/data/presets/presets/amenity/cafe.json
index 190db8b91..b378fe6b3 100644
--- a/data/presets/presets/amenity/cafe.json
+++ b/data/presets/presets/amenity/cafe.json
@@ -7,14 +7,6 @@
         "building_area",
         "address"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -28,4 +20,4 @@
     "tags": {
         "amenity": "cafe"
     }
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/cinema.json b/data/presets/presets/amenity/cinema.json
index 2c8bd598e..912095af5 100644
--- a/data/presets/presets/amenity/cinema.json
+++ b/data/presets/presets/amenity/cinema.json
@@ -5,14 +5,6 @@
         "building_area",
         "address"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -40,4 +32,4 @@
     "tags": {
         "amenity": "cinema"
     }
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/fast_food.json b/data/presets/presets/amenity/fast_food.json
index 07479eaeb..f54d782c5 100644
--- a/data/presets/presets/amenity/fast_food.json
+++ b/data/presets/presets/amenity/fast_food.json
@@ -6,14 +6,6 @@
         "building_area",
         "address"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -23,4 +15,4 @@
         "amenity": "fast_food"
     },
     "terms": []
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/fire_station.json b/data/presets/presets/amenity/fire_station.json
index 2ad30ad7e..c09448cc7 100644
--- a/data/presets/presets/amenity/fire_station.json
+++ b/data/presets/presets/amenity/fire_station.json
@@ -6,14 +6,6 @@
         "building_area",
         "address"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -23,4 +15,4 @@
         "amenity": "fire_station"
     },
     "terms": []
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/grave_yard.json b/data/presets/presets/amenity/grave_yard.json
index db6221435..1e77755c2 100644
--- a/data/presets/presets/amenity/grave_yard.json
+++ b/data/presets/presets/amenity/grave_yard.json
@@ -4,14 +4,6 @@
     "fields": [
         "religion"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -20,4 +12,4 @@
     "tags": {
         "amenity": "grave_yard"
     }
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/hospital.json b/data/presets/presets/amenity/hospital.json
index dd36abe7f..e4737f30c 100644
--- a/data/presets/presets/amenity/hospital.json
+++ b/data/presets/presets/amenity/hospital.json
@@ -6,14 +6,6 @@
         "building_area",
         "address"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -37,4 +29,4 @@
     "tags": {
         "amenity": "hospital"
     }
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/library.json b/data/presets/presets/amenity/library.json
index ab62c2530..b838d5118 100644
--- a/data/presets/presets/amenity/library.json
+++ b/data/presets/presets/amenity/library.json
@@ -6,14 +6,6 @@
         "building_area",
         "address"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -23,4 +15,4 @@
         "amenity": "library"
     },
     "terms": []
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/parking.json b/data/presets/presets/amenity/parking.json
index 1c8173ddd..2ea93f9a6 100644
--- a/data/presets/presets/amenity/parking.json
+++ b/data/presets/presets/amenity/parking.json
@@ -6,14 +6,6 @@
         "access",
         "address"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -23,4 +15,4 @@
         "amenity": "parking"
     },
     "terms": []
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/pharmacy.json b/data/presets/presets/amenity/pharmacy.json
index fbe051032..5b6d8adef 100644
--- a/data/presets/presets/amenity/pharmacy.json
+++ b/data/presets/presets/amenity/pharmacy.json
@@ -6,14 +6,6 @@
         "building_area",
         "address"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -23,4 +15,4 @@
         "amenity": "pharmacy"
     },
     "terms": []
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/place_of_worship.json b/data/presets/presets/amenity/place_of_worship.json
index 51d2489c0..e9da53dc5 100644
--- a/data/presets/presets/amenity/place_of_worship.json
+++ b/data/presets/presets/amenity/place_of_worship.json
@@ -7,14 +7,6 @@
         "building",
         "address"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -48,4 +40,4 @@
     "tags": {
         "amenity": "place_of_worship"
     }
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/place_of_worship/christian.json b/data/presets/presets/amenity/place_of_worship/christian.json
index f20cfd8fc..9d798dbaa 100644
--- a/data/presets/presets/amenity/place_of_worship/christian.json
+++ b/data/presets/presets/amenity/place_of_worship/christian.json
@@ -6,14 +6,6 @@
         "building",
         "address"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -47,4 +39,4 @@
         "amenity": "place_of_worship",
         "religion": "christian"
     }
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/place_of_worship/jewish.json b/data/presets/presets/amenity/place_of_worship/jewish.json
index 155343ffe..b3c0454f9 100644
--- a/data/presets/presets/amenity/place_of_worship/jewish.json
+++ b/data/presets/presets/amenity/place_of_worship/jewish.json
@@ -6,14 +6,6 @@
         "building",
         "address"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -27,4 +19,4 @@
         "amenity": "place_of_worship",
         "religion": "jewish"
     }
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/place_of_worship/muslim.json b/data/presets/presets/amenity/place_of_worship/muslim.json
index f2c4d3c69..1ec26eb9e 100644
--- a/data/presets/presets/amenity/place_of_worship/muslim.json
+++ b/data/presets/presets/amenity/place_of_worship/muslim.json
@@ -6,14 +6,6 @@
         "building",
         "address"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -27,4 +19,4 @@
         "amenity": "place_of_worship",
         "religion": "muslim"
     }
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/police.json b/data/presets/presets/amenity/police.json
index 6e67613f3..67bc7610d 100644
--- a/data/presets/presets/amenity/police.json
+++ b/data/presets/presets/amenity/police.json
@@ -6,14 +6,6 @@
         "building_area",
         "address"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -52,4 +44,4 @@
     "tags": {
         "amenity": "police"
     }
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/post_box.json b/data/presets/presets/amenity/post_box.json
index 23487ccb5..9399fee75 100644
--- a/data/presets/presets/amenity/post_box.json
+++ b/data/presets/presets/amenity/post_box.json
@@ -5,14 +5,6 @@
         "operator",
         "collection_times"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex"
@@ -28,4 +20,4 @@
         "pillar box",
         "postbox"
     ]
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/pub.json b/data/presets/presets/amenity/pub.json
index 0fab41e83..4af60dc36 100644
--- a/data/presets/presets/amenity/pub.json
+++ b/data/presets/presets/amenity/pub.json
@@ -5,14 +5,6 @@
         "building_area",
         "address"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -22,4 +14,4 @@
         "amenity": "pub"
     },
     "terms": []
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/restaurant.json b/data/presets/presets/amenity/restaurant.json
index da20a2a78..96fa1f7f2 100644
--- a/data/presets/presets/amenity/restaurant.json
+++ b/data/presets/presets/amenity/restaurant.json
@@ -6,14 +6,6 @@
         "building_area",
         "address"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -55,4 +47,4 @@
     "tags": {
         "amenity": "restaurant"
     }
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/school.json b/data/presets/presets/amenity/school.json
index af760a433..ab0021066 100644
--- a/data/presets/presets/amenity/school.json
+++ b/data/presets/presets/amenity/school.json
@@ -6,14 +6,6 @@
         "building",
         "address"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -40,4 +32,4 @@
     "tags": {
         "amenity": "school"
     }
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/toilets.json b/data/presets/presets/amenity/toilets.json
index d05499264..8b0761296 100644
--- a/data/presets/presets/amenity/toilets.json
+++ b/data/presets/presets/amenity/toilets.json
@@ -4,14 +4,6 @@
         "operator",
         "building"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -21,4 +13,4 @@
     "tags": {
         "amenity": "toilets"
     }
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/townhall.json b/data/presets/presets/amenity/townhall.json
index b80d2477b..031b1f68d 100644
--- a/data/presets/presets/amenity/townhall.json
+++ b/data/presets/presets/amenity/townhall.json
@@ -5,14 +5,6 @@
         "building_area",
         "address"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -28,4 +20,4 @@
     "tags": {
         "amenity": "townhall"
     }
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/university.json b/data/presets/presets/amenity/university.json
index b06794244..bdedb5737 100644
--- a/data/presets/presets/amenity/university.json
+++ b/data/presets/presets/amenity/university.json
@@ -5,14 +5,6 @@
         "operator",
         "address"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -22,4 +14,4 @@
         "amenity": "university"
     },
     "terms": []
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/supermarket.json b/data/presets/presets/shop/supermarket.json
index 0856cee47..837eccb99 100644
--- a/data/presets/presets/shop/supermarket.json
+++ b/data/presets/presets/shop/supermarket.json
@@ -6,14 +6,6 @@
         "building_area",
         "address"
     ],
-    "additional": [
-        "address",
-        "phone",
-        "website",
-        "wikipedia",
-        "elevation",
-        "source"
-    ],
     "geometry": [
         "point",
         "vertex",
@@ -44,4 +36,4 @@
     "tags": {
         "shop": "supermarket"
     }
-}
\ No newline at end of file
+}