diff --git a/data/presets.yaml b/data/presets.yaml
index e38078942..9e134f87c 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -300,6 +300,12 @@ en:
       amenity/cafe: 
         name: Cafe
         terms: "coffee,tea,coffee shop"
+      amenity/car_rental: 
+        name: Car Rental
+        terms: ""
+      amenity/car_sharing: 
+        name: Car Sharing
+        terms: ""
       amenity/car_wash: 
         name: Car Wash
         terms: ""
@@ -312,6 +318,9 @@ en:
       amenity/courthouse: 
         name: Courthouse
         terms: ""
+      amenity/drinking_water: 
+        name: Drinking Water
+        terms: "water fountain,potable water"
       amenity/embassy: 
         name: Embassy
         terms: ""
@@ -384,6 +393,9 @@ en:
       amenity/swimming_pool: 
         name: Swimming Pool
         terms: ""
+      amenity/taxi: 
+        name: Taxi Stand
+        terms: cab
       amenity/telephone: 
         name: Telephone
         terms: ""
@@ -392,7 +404,7 @@ en:
         terms: "theatre,performance,play,musical"
       amenity/toilets: 
         name: Toilets
-        terms: ""
+        terms: "bathroom,restroom"
       amenity/townhall: 
         name: Town Hall
         terms: "village hall,city government,courthouse,municipal building,municipal center"
@@ -954,6 +966,9 @@ en:
       shop/electronics: 
         name: Electronics Store
         terms: ""
+      shop/farm: 
+        name: Produce Stand
+        terms: "farm shop,farm stand"
       shop/fishmonger: 
         name: Fishmonger
         terms: ""
diff --git a/data/presets/presets.json b/data/presets/presets.json
index e00e73acd..3b7bdfc40 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -309,6 +309,33 @@
         },
         "name": "Cafe"
     },
+    "amenity/car_rental": {
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "amenity": "car_rental"
+        },
+        "fields": [
+            "operator"
+        ],
+        "name": "Car Rental"
+    },
+    "amenity/car_sharing": {
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "amenity": "car_sharing"
+        },
+        "fields": [
+            "operator",
+            "capacity"
+        ],
+        "name": "Car Sharing"
+    },
     "amenity/car_wash": {
         "geometry": [
             "point",
@@ -389,6 +416,20 @@
         },
         "name": "Courthouse"
     },
+    "amenity/drinking_water": {
+        "icon": "water",
+        "geometry": [
+            "point"
+        ],
+        "tags": {
+            "amenity": "drinking_water"
+        },
+        "terms": [
+            "water fountain",
+            "potable water"
+        ],
+        "name": "Drinking Water"
+    },
     "amenity/embassy": {
         "geometry": [
             "area",
@@ -965,6 +1006,23 @@
         "searchable": false,
         "name": "Swimming Pool"
     },
+    "amenity/taxi": {
+        "fields": [
+            "operator"
+        ],
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "terms": [
+            "cab"
+        ],
+        "tags": {
+            "amenity": "taxi"
+        },
+        "name": "Taxi Stand"
+    },
     "amenity/telephone": {
         "icon": "telephone",
         "geometry": [
@@ -1009,7 +1067,10 @@
             "vertex",
             "area"
         ],
-        "terms": [],
+        "terms": [
+            "bathroom",
+            "restroom"
+        ],
         "tags": {
             "amenity": "toilets"
         },
@@ -3713,6 +3774,27 @@
         },
         "name": "Electronics Store"
     },
+    "shop/farm": {
+        "icon": "shop",
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "tags": {
+            "shop": "farm"
+        },
+        "terms": [
+            "farm shop",
+            "farm stand"
+        ],
+        "name": "Produce Stand"
+    },
     "shop/fishmonger": {
         "icon": "shop",
         "fields": [
diff --git a/data/presets/presets/amenity/car_rental.json b/data/presets/presets/amenity/car_rental.json
new file mode 100644
index 000000000..b440d812e
--- /dev/null
+++ b/data/presets/presets/amenity/car_rental.json
@@ -0,0 +1,13 @@
+{
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "car_rental"
+    },
+    "fields": [
+        "operator"
+    ],
+    "name": "Car Rental"
+}
diff --git a/data/presets/presets/amenity/car_sharing.json b/data/presets/presets/amenity/car_sharing.json
new file mode 100644
index 000000000..db8b41fda
--- /dev/null
+++ b/data/presets/presets/amenity/car_sharing.json
@@ -0,0 +1,14 @@
+{
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "car_sharing"
+    },
+    "fields": [
+        "operator",
+        "capacity"
+    ],
+    "name": "Car Sharing"
+}
diff --git a/data/presets/presets/amenity/drinking_water.json b/data/presets/presets/amenity/drinking_water.json
new file mode 100644
index 000000000..f649c3ce7
--- /dev/null
+++ b/data/presets/presets/amenity/drinking_water.json
@@ -0,0 +1,14 @@
+{
+    "icon": "water",
+    "geometry": [
+        "point"
+    ],
+    "tags": {
+        "amenity": "drinking_water"
+    },
+    "terms": [
+        "water fountain",
+        "potable water"
+    ],
+    "name": "Drinking Water"
+}
diff --git a/data/presets/presets/amenity/taxi.json b/data/presets/presets/amenity/taxi.json
new file mode 100644
index 000000000..016e4082a
--- /dev/null
+++ b/data/presets/presets/amenity/taxi.json
@@ -0,0 +1,17 @@
+{
+    "fields": [
+        "operator"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "terms": [
+        "cab"
+    ],
+    "tags": {
+        "amenity": "taxi"
+    },
+    "name": "Taxi Stand"
+}
diff --git a/data/presets/presets/amenity/toilets.json b/data/presets/presets/amenity/toilets.json
index c5f3a94cd..fb03ce27b 100644
--- a/data/presets/presets/amenity/toilets.json
+++ b/data/presets/presets/amenity/toilets.json
@@ -8,7 +8,10 @@
         "vertex",
         "area"
     ],
-    "terms": [],
+    "terms": [
+        "bathroom",
+        "restroom"
+    ],
     "tags": {
         "amenity": "toilets"
     },
diff --git a/data/presets/presets/shop/farm.json b/data/presets/presets/shop/farm.json
new file mode 100644
index 000000000..fd7898253
--- /dev/null
+++ b/data/presets/presets/shop/farm.json
@@ -0,0 +1,21 @@
+{
+    "icon": "shop",
+    "fields": [
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "tags": {
+        "shop": "farm"
+    },
+    "terms": [
+        "farm shop",
+        "farm stand"
+    ],
+    "name": "Produce Stand"
+}
\ No newline at end of file
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 563f91472..a35517a4c 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -777,6 +777,14 @@
                 "name": "Cafe",
                 "terms": "coffee,tea,coffee shop"
             },
+            "amenity/car_rental": {
+                "name": "Car Rental",
+                "terms": ""
+            },
+            "amenity/car_sharing": {
+                "name": "Car Sharing",
+                "terms": ""
+            },
             "amenity/car_wash": {
                 "name": "Car Wash",
                 "terms": ""
@@ -793,6 +801,10 @@
                 "name": "Courthouse",
                 "terms": ""
             },
+            "amenity/drinking_water": {
+                "name": "Drinking Water",
+                "terms": "water fountain,potable water"
+            },
             "amenity/embassy": {
                 "name": "Embassy",
                 "terms": ""
@@ -889,6 +901,10 @@
                 "name": "Swimming Pool",
                 "terms": ""
             },
+            "amenity/taxi": {
+                "name": "Taxi Stand",
+                "terms": "cab"
+            },
             "amenity/telephone": {
                 "name": "Telephone",
                 "terms": ""
@@ -899,7 +915,7 @@
             },
             "amenity/toilets": {
                 "name": "Toilets",
-                "terms": ""
+                "terms": "bathroom,restroom"
             },
             "amenity/townhall": {
                 "name": "Town Hall",
@@ -1649,6 +1665,10 @@
                 "name": "Electronics Store",
                 "terms": ""
             },
+            "shop/farm": {
+                "name": "Produce Stand",
+                "terms": "farm shop,farm stand"
+            },
             "shop/fishmonger": {
                 "name": "Fishmonger",
                 "terms": ""