diff --git a/data/presets/amenity/boat_rental.json b/data/presets/amenity/boat_rental.json
index 589093e2..4af7d57d 100644
--- a/data/presets/amenity/boat_rental.json
+++ b/data/presets/amenity/boat_rental.json
@@ -21,5 +21,8 @@
     "tags": {
         "amenity": "boat_rental"
     },
+    "terms": [
+        "boat hire"
+    ],
     "name": "Boat Rental"
 }
diff --git a/data/presets/amenity/motorcycle_parking.json b/data/presets/amenity/motorcycle_parking.json
index fd508552..d087eed1 100644
--- a/data/presets/amenity/motorcycle_parking.json
+++ b/data/presets/amenity/motorcycle_parking.json
@@ -14,5 +14,8 @@
     "tags": {
         "amenity": "motorcycle_parking"
     },
+    "terms": [
+        "motorbike parking"
+    ],
     "name": "Motorcycle Parking"
 }
diff --git a/data/presets/amenity/telephone.json b/data/presets/amenity/telephone.json
index 996dcf1e..0d9454b8 100644
--- a/data/presets/amenity/telephone.json
+++ b/data/presets/amenity/telephone.json
@@ -27,6 +27,9 @@
         "amenity": "telephone"
     },
     "terms": [
+        "payphone",
+        "pay phone",
+        "phone booth",
         "phone"
     ],
     "name": "Telephone"
diff --git a/data/presets/barrier/height_restrictor.json b/data/presets/barrier/height_restrictor.json
index fe71548e..c539e825 100644
--- a/data/presets/barrier/height_restrictor.json
+++ b/data/presets/barrier/height_restrictor.json
@@ -16,6 +16,7 @@
         "height barrier",
         "height restriction barrier",
         "maxheight",
+        "max height",
         "maximum height measurer"
     ],
     "name": "Height Restrictor"
diff --git a/data/presets/barrier/motorcycle_barrier.json b/data/presets/barrier/motorcycle_barrier.json
index 09ffe28f..f3d879c4 100644
--- a/data/presets/barrier/motorcycle_barrier.json
+++ b/data/presets/barrier/motorcycle_barrier.json
@@ -12,5 +12,8 @@
     "tags": {
         "barrier": "motorcycle_barrier"
     },
+    "terms": [
+        "motorbike barrier"
+    ],
     "name": "Motorcycle Barrier"
 }
diff --git a/data/presets/emergency/life_ring.json b/data/presets/emergency/life_ring.json
index 80bdaaa7..21119ad7 100644
--- a/data/presets/emergency/life_ring.json
+++ b/data/presets/emergency/life_ring.json
@@ -9,6 +9,7 @@
         "vertex"
     ],
     "terms": [
+        "lifering",
         "life buoy",
         "kisby ring",
         "kisbie ring",
diff --git a/data/presets/emergency/phone.json b/data/presets/emergency/phone.json
index efea67f5..c951b3fa 100644
--- a/data/presets/emergency/phone.json
+++ b/data/presets/emergency/phone.json
@@ -17,5 +17,10 @@
     "tags": {
         "emergency": "phone"
     },
+    "terms": [
+        "sos",
+        "help",
+        "call point"
+    ],
     "name": "Emergency Phone"
 }
diff --git a/data/presets/landuse/aquaculture.json b/data/presets/landuse/aquaculture.json
index 9e367b3e..82b5c1eb 100644
--- a/data/presets/landuse/aquaculture.json
+++ b/data/presets/landuse/aquaculture.json
@@ -17,11 +17,13 @@
     },
     "terms": [
         "fish farm",
+        "marine farm",
         "crustacean",
         "algae",
         "aquafarming",
         "shrimp farm",
         "oyster farm",
+        "mussel farm",
         "mariculture",
         "algaculture"
     ],
diff --git a/data/presets/man_made/storage_tank.json b/data/presets/man_made/storage_tank.json
index 2458e641..f7679806 100644
--- a/data/presets/man_made/storage_tank.json
+++ b/data/presets/man_made/storage_tank.json
@@ -21,6 +21,7 @@
         "water",
         "oil",
         "gas",
+        "fuel",
         "petrol"
     ],
     "tags": {
diff --git a/data/presets/man_made/watermill.json b/data/presets/man_made/watermill.json
index 68236b5a..f0d14c94 100644
--- a/data/presets/man_made/watermill.json
+++ b/data/presets/man_made/watermill.json
@@ -15,6 +15,8 @@
         "area"
     ],
     "terms": [
+        "waterwheel",
+        "water wheel",
         "water",
         "wheel",
         "mill"
diff --git a/data/presets/public_transport/platform/train.json b/data/presets/public_transport/platform/train.json
index accba652..9f407f52 100644
--- a/data/presets/public_transport/platform/train.json
+++ b/data/presets/public_transport/platform/train.json
@@ -28,6 +28,7 @@
         "public transit",
         "public transportation",
         "rail",
+        "railway platform",
         "track",
         "train",
         "transit",
diff --git a/data/presets/shop/motorcycle.json b/data/presets/shop/motorcycle.json
index f7b90705..10e9a423 100644
--- a/data/presets/shop/motorcycle.json
+++ b/data/presets/shop/motorcycle.json
@@ -10,7 +10,8 @@
         "area"
     ],
     "terms": [
-        "bike"
+        "bike",
+        "motorbike"
     ],
     "tags": {
         "shop": "motorcycle"
diff --git a/data/presets/shop/motorcycle_repair.json b/data/presets/shop/motorcycle_repair.json
index 582c7060..c60b348c 100644
--- a/data/presets/shop/motorcycle_repair.json
+++ b/data/presets/shop/motorcycle_repair.json
@@ -13,6 +13,7 @@
         "bike",
         "garage",
         "motorcycle",
+        "motorbike",
         "repair",
         "service"
     ],
diff --git a/data/presets/tourism/theme_park.json b/data/presets/tourism/theme_park.json
index b9604332..8f789047 100644
--- a/data/presets/tourism/theme_park.json
+++ b/data/presets/tourism/theme_park.json
@@ -20,5 +20,9 @@
     "tags": {
         "tourism": "theme_park"
     },
+    "terms": [
+        "amusement park",
+        "fun park"
+    ],
     "name": "Theme Park"
 }
diff --git a/data/presets/tourism/viewpoint.json b/data/presets/tourism/viewpoint.json
index df2e3aec..caec6c2e 100644
--- a/data/presets/tourism/viewpoint.json
+++ b/data/presets/tourism/viewpoint.json
@@ -14,5 +14,8 @@
     "tags": {
         "tourism": "viewpoint"
     },
+    "terms": [
+        "lookout"
+    ],
     "name": "Viewpoint"
 }