diff --git a/data/presets.yaml b/data/presets.yaml
index e09630397..c7e99b4db 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2623,11 +2623,21 @@ en:
         name: Firepit
         # 'terms: fireplace,campfire'
         terms: '<translate with synonyms or related terms for ''Firepit'', separated by commas>'
+      leisure/fitness_centre:
+        # leisure=fitness_centre
+        name: Gym / Fitness Center
+        # 'terms: health,gym,leisure,studio'
+        terms: '<translate with synonyms or related terms for ''Gym / Fitness Center'', separated by commas>'
       leisure/fitness_centre/yoga:
         # 'leisure=fitness_centre, sport=yoga'
         name: Yoga Studio
         # 'terms: studio'
         terms: '<translate with synonyms or related terms for ''Yoga Studio'', separated by commas>'
+      leisure/fitness_station:
+        # leisure=fitness_station
+        name: Outdoor Fitness Station
+        # 'terms: fitness,gym'
+        terms: '<translate with synonyms or related terms for ''Outdoor Fitness Station'', separated by commas>'
       leisure/garden:
         # leisure=garden
         name: Garden
@@ -2728,9 +2738,8 @@ en:
         terms: '<translate with synonyms or related terms for ''Slipway'', separated by commas>'
       leisure/sports_centre:
         # leisure=sports_centre
-        name: Sports Center / Gym
-        # 'terms: gym'
-        terms: '<translate with synonyms or related terms for ''Sports Center / Gym'', separated by commas>'
+        name: Sports Center / Complex
+        terms: '<translate with synonyms or related terms for ''Sports Center / Complex'', separated by commas>'
       leisure/sports_centre/swimming:
         # 'leisure=sports_centre, sport=swimming'
         name: Swimming Pool Facility
@@ -2844,6 +2853,7 @@ en:
       man_made/surveillance:
         # man_made=surveillance
         name: Surveillance
+        # 'terms: cctv'
         terms: '<translate with synonyms or related terms for ''Surveillance'', separated by commas>'
       man_made/survey_point:
         # man_made=survey_point
@@ -3214,6 +3224,11 @@ en:
         # railway=abandoned
         name: Abandoned Railway
         terms: '<translate with synonyms or related terms for ''Abandoned Railway'', separated by commas>'
+      railway/crossing:
+        # railway=crossing
+        name: Railway Crossing (Path)
+        # 'terms: crossing,pedestrian crossing,railroad crossing,level crossing,grade crossing,path through railroad,train crossing'
+        terms: '<translate with synonyms or related terms for ''Railway Crossing (Path)'', separated by commas>'
       railway/disused:
         # railway=disused
         name: Disused Railway
@@ -3230,9 +3245,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Railway Halt'', separated by commas>'
       railway/level_crossing:
         # railway=level_crossing
-        name: Railway Crossing
+        name: Railway Crossing (Road)
         # 'terms: crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing'
-        terms: '<translate with synonyms or related terms for ''Railway Crossing'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Railway Crossing (Road)'', separated by commas>'
       railway/monorail:
         # railway=monorail
         name: Monorail
@@ -3456,6 +3471,11 @@ en:
         # shop=dry_cleaning
         name: Dry Cleaner
         terms: '<translate with synonyms or related terms for ''Dry Cleaner'', separated by commas>'
+      shop/e-cigarette:
+        # shop=e-cigarette
+        name: E-Cigarette Shop
+        # 'terms: electronic,vapor'
+        terms: '<translate with synonyms or related terms for ''E-Cigarette Shop'', separated by commas>'
       shop/electronics:
         # shop=electronics
         name: Electronics Store
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 085de1fc7..54642c08f 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -821,7 +821,8 @@
     "amenity/charging_station": {
         "icon": "car",
         "fields": [
-            "operator"
+            "operator",
+            "capacity"
         ],
         "geometry": [
             "point",
@@ -5840,6 +5841,29 @@
         ],
         "name": "Firepit"
     },
+    "leisure/fitness_centre": {
+        "icon": "pitch",
+        "fields": [
+            "sport",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "leisure": "fitness_centre"
+        },
+        "terms": [
+            "health",
+            "gym",
+            "leisure",
+            "studio"
+        ],
+        "name": "Gym / Fitness Center"
+    },
     "leisure/fitness_centre/yoga": {
         "icon": "pitch",
         "fields": [
@@ -5861,6 +5885,26 @@
         },
         "name": "Yoga Studio"
     },
+    "leisure/fitness_station": {
+        "icon": "pitch",
+        "fields": [
+            "sport",
+            "address",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "leisure": "fitness_station"
+        },
+        "terms": [
+            "fitness",
+            "gym"
+        ],
+        "name": "Outdoor Fitness Station"
+    },
     "leisure/garden": {
         "icon": "garden",
         "fields": [
@@ -6278,10 +6322,8 @@
         "tags": {
             "leisure": "sports_centre"
         },
-        "terms": [
-            "gym"
-        ],
-        "name": "Sports Center / Gym"
+        "terms": [],
+        "name": "Sports Center / Complex"
     },
     "leisure/sports_centre/swimming": {
         "icon": "swimming",
@@ -6651,6 +6693,9 @@
         "geometry": [
             "point"
         ],
+        "terms": [
+            "cctv"
+        ],
         "tags": {
             "man_made": "surveillance"
         },
@@ -7958,6 +8003,25 @@
         "terms": [],
         "name": "Abandoned Railway"
     },
+    "railway/crossing": {
+        "icon": "cross",
+        "geometry": [
+            "vertex"
+        ],
+        "tags": {
+            "railway": "crossing"
+        },
+        "terms": [
+            "crossing",
+            "pedestrian crossing",
+            "railroad crossing",
+            "level crossing",
+            "grade crossing",
+            "path through railroad",
+            "train crossing"
+        ],
+        "name": "Railway Crossing (Path)"
+    },
     "railway/disused": {
         "icon": "railway-disused",
         "geometry": [
@@ -8029,7 +8093,7 @@
             "road through railroad",
             "train crossing"
         ],
-        "name": "Railway Crossing"
+        "name": "Railway Crossing (Road)"
     },
     "railway/monorail": {
         "icon": "railway-monorail",
@@ -8091,6 +8155,7 @@
             "structure",
             "gauge",
             "electrified",
+            "maxspeed",
             "service_rail"
         ],
         "terms": [],
@@ -8980,6 +9045,27 @@
         },
         "name": "Dry Cleaner"
     },
+    "shop/e-cigarette": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "e-cigarette"
+        },
+        "terms": [
+            "electronic",
+            "vapor"
+        ],
+        "name": "E-Cigarette Shop"
+    },
     "shop/electronics": {
         "icon": "shop",
         "fields": [
diff --git a/data/taginfo.json b/data/taginfo.json
index 7ef5db429..e6112b589 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1331,10 +1331,18 @@
             "key": "leisure",
             "value": "firepit"
         },
+        {
+            "key": "leisure",
+            "value": "fitness_centre"
+        },
         {
             "key": "sport",
             "value": "yoga"
         },
+        {
+            "key": "leisure",
+            "value": "fitness_station"
+        },
         {
             "key": "leisure",
             "value": "garden"
@@ -1859,6 +1867,10 @@
             "key": "railway",
             "value": "abandoned"
         },
+        {
+            "key": "railway",
+            "value": "crossing"
+        },
         {
             "key": "railway",
             "value": "disused"
@@ -2078,6 +2090,10 @@
             "key": "shop",
             "value": "dry_cleaning"
         },
+        {
+            "key": "shop",
+            "value": "e-cigarette"
+        },
         {
             "key": "shop",
             "value": "electronics"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 25a6b65c4..f8a7393f0 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2943,10 +2943,18 @@
                 "name": "Firepit",
                 "terms": "fireplace,campfire"
             },
+            "leisure/fitness_centre": {
+                "name": "Gym / Fitness Center",
+                "terms": "health,gym,leisure,studio"
+            },
             "leisure/fitness_centre/yoga": {
                 "name": "Yoga Studio",
                 "terms": "studio"
             },
+            "leisure/fitness_station": {
+                "name": "Outdoor Fitness Station",
+                "terms": "fitness,gym"
+            },
             "leisure/garden": {
                 "name": "Garden",
                 "terms": ""
@@ -3036,8 +3044,8 @@
                 "terms": "boat launch,boat ramp"
             },
             "leisure/sports_centre": {
-                "name": "Sports Center / Gym",
-                "terms": "gym"
+                "name": "Sports Center / Complex",
+                "terms": ""
             },
             "leisure/sports_centre/swimming": {
                 "name": "Swimming Pool Facility",
@@ -3141,7 +3149,7 @@
             },
             "man_made/surveillance": {
                 "name": "Surveillance",
-                "terms": ""
+                "terms": "cctv"
             },
             "man_made/survey_point": {
                 "name": "Survey Point",
@@ -3483,6 +3491,10 @@
                 "name": "Abandoned Railway",
                 "terms": ""
             },
+            "railway/crossing": {
+                "name": "Railway Crossing (Path)",
+                "terms": "crossing,pedestrian crossing,railroad crossing,level crossing,grade crossing,path through railroad,train crossing"
+            },
             "railway/disused": {
                 "name": "Disused Railway",
                 "terms": ""
@@ -3496,7 +3508,7 @@
                 "terms": "break,interrupt,rest,wait,interruption"
             },
             "railway/level_crossing": {
-                "name": "Railway Crossing",
+                "name": "Railway Crossing (Road)",
                 "terms": "crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing"
             },
             "railway/monorail": {
@@ -3707,6 +3719,10 @@
                 "name": "Dry Cleaner",
                 "terms": ""
             },
+            "shop/e-cigarette": {
+                "name": "E-Cigarette Shop",
+                "terms": "electronic,vapor"
+            },
             "shop/electronics": {
                 "name": "Electronics Store",
                 "terms": "appliance,audio,computer,tv"