diff --git a/data/presets/forms.json b/data/presets/forms.json
index 664d8ad6e..363ce05fa 100644
--- a/data/presets/forms.json
+++ b/data/presets/forms.json
@@ -1 +1 @@
-{"access":{"key":"access","type":"combo"},"address":{"type":"address","title":"Address","keys":["addr:housename","addr:housenumber","addr:street","addr:city"]},"atm":{"key":"atm","type":"check"},"bridge":{"key":"bridge","type":"defaultcheck"},"building":{"key":"building","type":"combo"},"building_area":{"key":"building","type":"check","default":{"area":"yes"}},"building_yes":{"key":"building","type":"combo","default":{"area":"yes"}},"capacity":{"key":"capacity","type":"text"},"cuisine":{"key":"cuisine","type":"combo","indexed":true},"denomination":{"key":"denomination","type":"combo"},"elevation":{"key":"ele","type":"number"},"emergency":{"key":"emergency","type":"check"},"fee":{"key":"fee","type":"check"},"internet_access":{"key":"internet_access","title":"Internet Access","type":"combo","options":["yes","no","wlan","wired","terminal"]},"layer":{"key":"layer","type":"combo"},"levels":{"key":"building:levels","type":"number","title":"Levels"},"maxspeed":{"key":"maxspeed","type":"combo"},"network":{"key":"network","type":"text"},"oneway":{"key":"oneway","type":"check"},"opening_hours":{"key":"opening_hours","type":"text"},"operator":{"key":"operator","type":"text"},"religion":{"key":"religion","type":"combo","options":["christian","muslim","buddhist","jewish","hindu","shinto","taoist"]},"roadtype":{"title":" ","type":"radio","options":["bridge","tunnel","embankment","cutting"]},"shelter":{"key":"shelter","type":"check"},"surface":{"key":"surface","type":"combo"},"tunnel":{"key":"tunnel","type":"defaultcheck"}}
\ No newline at end of file
+{"access":{"key":"access","type":"combo"},"address":{"type":"address","title":"Address","keys":["addr:housename","addr:housenumber","addr:street","addr:city"]},"atm":{"key":"atm","type":"check"},"building":{"key":"building","type":"combo"},"building_area":{"key":"building","type":"check","default":{"area":"yes"}},"building_yes":{"key":"building","type":"combo","default":{"area":"yes"}},"capacity":{"key":"capacity","type":"text"},"cuisine":{"key":"cuisine","type":"combo","indexed":true},"denomination":{"key":"denomination","type":"combo"},"elevation":{"key":"ele","type":"number"},"emergency":{"key":"emergency","type":"check"},"fee":{"key":"fee","type":"check"},"internet_access":{"key":"internet_access","title":"Internet Access","type":"combo","options":["yes","no","wlan","wired","terminal"]},"layer":{"key":"layer","type":"combo"},"levels":{"key":"building:levels","type":"number","title":"Levels"},"maxspeed":{"key":"maxspeed","type":"combo"},"network":{"key":"network","type":"text"},"oneway":{"key":"oneway","type":"check"},"opening_hours":{"key":"opening_hours","type":"text"},"operator":{"key":"operator","type":"text"},"religion":{"key":"religion","type":"combo","options":["christian","muslim","buddhist","jewish","hindu","shinto","taoist"]},"roadtype":{"title":" ","type":"radio","options":["bridge","tunnel","embankment","cutting"]},"shelter":{"key":"shelter","type":"check"},"surface":{"key":"surface","type":"combo"}}
\ No newline at end of file
diff --git a/data/presets/forms/access.json b/data/presets/forms/access.json
index b16348cb1..4d880a5c9 100644
--- a/data/presets/forms/access.json
+++ b/data/presets/forms/access.json
@@ -1,4 +1,4 @@
 {
-    "key": "Access",
+    "key": "access",
     "type": "combo"
 }
\ No newline at end of file
diff --git a/data/presets/forms/bridge.json b/data/presets/forms/bridge.json
deleted file mode 100644
index 8e2dbb424..000000000
--- a/data/presets/forms/bridge.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "key": "bridge",
-    "type": "defaultcheck"
-}
diff --git a/data/presets/forms/building.json b/data/presets/forms/building.json
index 82c7ebf17..87257d332 100644
--- a/data/presets/forms/building.json
+++ b/data/presets/forms/building.json
@@ -1,4 +1,4 @@
 {
-    "key": "Building",
+    "key": "building",
     "type": "combo"
 }
\ No newline at end of file
diff --git a/data/presets/forms/fee.json b/data/presets/forms/fee.json
index 42e4dc693..d2ef7da4a 100644
--- a/data/presets/forms/fee.json
+++ b/data/presets/forms/fee.json
@@ -1,4 +1,4 @@
 {
-    "key": "Fee",
+    "key": "fee",
     "type": "check"
 }
\ No newline at end of file
diff --git a/data/presets/forms/roadtype.json b/data/presets/forms/roadtype.json
index daf4dd6e7..4d8583857 100644
--- a/data/presets/forms/roadtype.json
+++ b/data/presets/forms/roadtype.json
@@ -1,5 +1,5 @@
 {
-    "key": "type",
+    "title": " ",
     "type": "radio",
     "options": [
         "bridge",
diff --git a/data/presets/forms/tunnel.json b/data/presets/forms/tunnel.json
deleted file mode 100644
index 0de409650..000000000
--- a/data/presets/forms/tunnel.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "key": "tunnel",
-    "type": "defaultcheck"
-}