diff --git a/data/presets/presets/amenity/animal_shelter.json b/data/presets/presets/amenity/animal_shelter.json
index 66c35de47..f514b66d7 100644
--- a/data/presets/presets/amenity/animal_shelter.json
+++ b/data/presets/presets/amenity/animal_shelter.json
@@ -32,7 +32,8 @@
         "raptor",
         "reptile",
         "rescue",
-        "spca"
+        "spca",
+        "pound"
     ],
     "tags": {
         "amenity": "animal_shelter"
diff --git a/data/presets/presets/amenity/bench.json b/data/presets/presets/amenity/bench.json
index f41127a3a..cd5b22f82 100644
--- a/data/presets/presets/amenity/bench.json
+++ b/data/presets/presets/amenity/bench.json
@@ -17,7 +17,8 @@
         "line"
     ],
     "terms": [
-        "seat"
+        "seat",
+        "chair"
     ],
     "tags": {
         "amenity": "bench"
diff --git a/data/presets/presets/amenity/bicycle_rental.json b/data/presets/presets/amenity/bicycle_rental.json
index 4b0768ef5..22a293512 100644
--- a/data/presets/presets/amenity/bicycle_rental.json
+++ b/data/presets/presets/amenity/bicycle_rental.json
@@ -23,7 +23,13 @@
         "area"
     ],
     "terms": [
-        "bike"
+        "bike",
+        "bicycle",
+        "bikeshare",
+        "bike share",
+        "bicycle share",
+        "hub",
+        "dock"
     ],
     "tags": {
         "amenity": "bicycle_rental"
diff --git a/data/presets/presets/amenity/bicycle_repair_station.json b/data/presets/presets/amenity/bicycle_repair_station.json
index a9ad27fc4..8789f55ab 100644
--- a/data/presets/presets/amenity/bicycle_repair_station.json
+++ b/data/presets/presets/amenity/bicycle_repair_station.json
@@ -19,7 +19,10 @@
         "bike",
         "repair",
         "chain",
-        "pump"
+        "pump",
+        "tools",
+        "stand",
+        "multitool"
     ],
     "tags": {
         "amenity": "bicycle_repair_station"
diff --git a/data/presets/presets/amenity/clock.json b/data/presets/presets/amenity/clock.json
index 12fed263e..310d5c079 100644
--- a/data/presets/presets/amenity/clock.json
+++ b/data/presets/presets/amenity/clock.json
@@ -16,6 +16,9 @@
         "point",
         "vertex"
     ],
+    "terms":[
+        "time"
+    ],
     "tags": {
         "amenity": "clock"
     },
diff --git a/data/presets/presets/amenity/parking.json b/data/presets/presets/amenity/parking.json
index a69f63d2b..cc184be33 100644
--- a/data/presets/presets/amenity/parking.json
+++ b/data/presets/presets/amenity/parking.json
@@ -38,7 +38,8 @@
         "car parking",
         "rv parking",
         "truck parking",
-        "vehicle parking"
+        "vehicle parking",
+        "garage"
     ],
     "name": "Parking Lot"
 }
diff --git a/data/presets/presets/amenity/prison.json b/data/presets/presets/amenity/prison.json
index 0ea39afb5..be3f87e11 100644
--- a/data/presets/presets/amenity/prison.json
+++ b/data/presets/presets/amenity/prison.json
@@ -18,7 +18,8 @@
     ],
     "terms": [
         "cell",
-        "jail"
+        "jail",
+        "correction"
     ],
     "tags": {
         "amenity": "prison"
diff --git a/data/presets/presets/highway/cycleway/bicycle_foot.json b/data/presets/presets/highway/cycleway/bicycle_foot.json
index 28ccb4f1b..d787c03b2 100644
--- a/data/presets/presets/highway/cycleway/bicycle_foot.json
+++ b/data/presets/presets/highway/cycleway/bicycle_foot.json
@@ -19,7 +19,8 @@
         "greenway",
         "mixed-use trail",
         "multi-use trail",
-        "segregated trail"
+        "segregated trail",
+        "rail trail"
     ],
     "matchScore": 0.95,
     "name": "Cycle & Foot Path"