diff --git a/data/presets/amenity/childcare.json b/data/presets/amenity/childcare.json
index ab5fb43e..079940d3 100644
--- a/data/presets/amenity/childcare.json
+++ b/data/presets/amenity/childcare.json
@@ -12,6 +12,7 @@
     ],
     "moreFields": [
         "baby_feeding",
+        "capacity",
         "email",
         "fax",
         "gnis/feature_id-US",
diff --git a/data/presets/amenity/kindergarten.json b/data/presets/amenity/kindergarten.json
index 559b261c..9e8a44ec 100644
--- a/data/presets/amenity/kindergarten.json
+++ b/data/presets/amenity/kindergarten.json
@@ -9,6 +9,7 @@
         "preschool"
     ],
     "moreFields": [
+        "capacity",
         "email",
         "fax",
         "gnis/feature_id-US",
diff --git a/data/presets/amenity/school.json b/data/presets/amenity/school.json
index 517d4dc4..5438f492 100644
--- a/data/presets/amenity/school.json
+++ b/data/presets/amenity/school.json
@@ -11,6 +11,7 @@
         "website"
     ],
     "moreFields": [
+        "capacity",
         "charge_fee",
         "email",
         "fax",
diff --git a/data/presets/barrier/hedge.json b/data/presets/barrier/hedge.json
index 1499944a..acd6dd1d 100644
--- a/data/presets/barrier/hedge.json
+++ b/data/presets/barrier/hedge.json
@@ -3,6 +3,9 @@
     "fields": [
         "height"
     ],
+    "moreFields": [
+        "species/wikidata"
+    ],
     "geometry": [
         "line",
         "area"
diff --git a/data/presets/landuse/railway.json b/data/presets/landuse/railway.json
index 92a3237a..8f1fdb1c 100644
--- a/data/presets/landuse/railway.json
+++ b/data/presets/landuse/railway.json
@@ -11,6 +11,7 @@
     },
     "terms": [
         "rail",
+        "railway",
         "train",
         "track"
     ],
diff --git a/data/presets/natural/scrub.json b/data/presets/natural/scrub.json
index 4b4420b8..a5650625 100644
--- a/data/presets/natural/scrub.json
+++ b/data/presets/natural/scrub.json
@@ -1,5 +1,10 @@
 {
     "icon": "temaki-shrub",
+    "moreFields": [
+        "leaf_type",
+        "leaf_cycle",
+        "species/wikidata"
+    ],
     "geometry": [
         "area"
     ],
diff --git a/data/presets/natural/tree_row.json b/data/presets/natural/tree_row.json
index 56762781..3d05991d 100644
--- a/data/presets/natural/tree_row.json
+++ b/data/presets/natural/tree_row.json
@@ -5,6 +5,9 @@
         "leaf_cycle",
         "denotation"
     ],
+    "moreFields": [
+        "species/wikidata"
+    ],
     "geometry": [
         "line"
     ],
diff --git a/data/presets/natural/wood.json b/data/presets/natural/wood.json
index 6ad9e4d0..71216631 100644
--- a/data/presets/natural/wood.json
+++ b/data/presets/natural/wood.json
@@ -5,6 +5,9 @@
         "leaf_type",
         "leaf_cycle"
     ],
+    "moreFields": [
+        "species/wikidata"
+    ],
     "geometry": [
         "area",
         "point"
diff --git a/data/presets/police/checkpoint b/data/presets/police/checkpoint
new file mode 100644
index 00000000..20367799
--- /dev/null
+++ b/data/presets/police/checkpoint
@@ -0,0 +1,25 @@
+{
+    "icon": "temaki-military_checkpoint",
+    "fields": [
+        "name"
+    ],
+    "moreFields": [
+        "opening_hours",
+        "opening_hours.covid19"      
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "terms": [
+        "checkpoint",
+        "patrol",
+        "roadblock",
+        "spot check",
+        "stop"
+    ],
+    "tags": {
+        "police": "checkpoint"
+    ],
+    "name": "Police Checkpoint"