diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
index 6c05fa04ba..9bde3a320a 100644
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@@ -3370,18 +3370,6 @@
         "nl": "Moet men betalen om dit oplaadpunt te gebruiken?"
       },
       "mappings": [
-        {
-          "if": {
-            "and": [
-              "fee=no"
-            ]
-          },
-          "then": {
-            "nl": "Gratis te gebruiken",
-            "en": "Free to use"
-          },
-          "hideInAnswer": true
-        },
         {
           "if": {
             "and": [
@@ -3410,6 +3398,18 @@
             "en": "Free to use, but one has to authenticate"
           }
         },
+        {
+          "if": {
+            "and": [
+              "fee=no"
+            ]
+          },
+          "then": {
+            "nl": "Gratis te gebruiken",
+            "en": "Free to use"
+          },
+          "hideInAnswer": true
+        },
         {
           "if": {
             "and": [
diff --git a/assets/layers/charging_station/charging_station.protojson b/assets/layers/charging_station/charging_station.protojson
index 7c6d492ecd..ad748caa2a 100644
--- a/assets/layers/charging_station/charging_station.protojson
+++ b/assets/layers/charging_station/charging_station.protojson
@@ -224,18 +224,6 @@
         "nl": "Moet men betalen om dit oplaadpunt te gebruiken?"
       },
       "mappings": [
-        {
-          "if": {
-            "and": [
-              "fee=no"
-            ]
-          },
-          "then": {
-            "nl": "Gratis te gebruiken",
-            "en": "Free to use"
-          },
-          "hideInAnswer": true
-        },
         {
           "if": {
             "and": [
@@ -264,6 +252,18 @@
             "en": "Free to use, but one has to authenticate"
           }
         },
+        {
+          "if": {
+            "and": [
+              "fee=no"
+            ]
+          },
+          "then": {
+            "nl": "Gratis te gebruiken",
+            "en": "Free to use"
+          },
+          "hideInAnswer": true
+        },
         {
           "if": {
             "and": [
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 4b8f0a4ac4..8374aca582 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -494,6 +494,9 @@
                     },
                     "5": {
                         "then": "Tandem bicycles can be rented here"
+                    },
+                    "6": {
+                        "then": "Race bicycles can be rented here"
                     }
                 },
                 "question": "What kind of bicycles and accessories are rented here?",
@@ -1794,14 +1797,14 @@
             "fee": {
                 "mappings": {
                     "0": {
-                        "then": "Free to use"
-                    },
-                    "1": {
                         "then": "Free to use (without authenticating)"
                     },
-                    "2": {
+                    "1": {
                         "then": "Free to use, but one has to authenticate"
                     },
+                    "2": {
+                        "then": "Free to use"
+                    },
                     "3": {
                         "then": "Paid use, but free for customers of the hotel/pub/hospital/... who operates the charging station"
                     },
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index a20a9da1b6..4c5b204279 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -494,6 +494,9 @@
                     },
                     "5": {
                         "then": "Tandems kunnen hier gehuurd worden"
+                    },
+                    "6": {
+                        "then": "Wielerfietsen (sportfietsen) kunnen hier gehuurd worden"
                     }
                 },
                 "question": "Wat voor soort fietsen en fietstoebehren worden hier verhuurd?",
@@ -1803,14 +1806,14 @@
             "fee": {
                 "mappings": {
                     "0": {
-                        "then": "Gratis te gebruiken"
-                    },
-                    "1": {
                         "then": "Gratis te gebruiken (zonder aan te melden)"
                     },
-                    "2": {
+                    "1": {
                         "then": "Gratis te gebruiken, maar aanmelden met een applicatie is verplicht"
                     },
+                    "2": {
+                        "then": "Gratis te gebruiken"
+                    },
                     "3": {
                         "then": "Betalend te gebruiken, maar gratis voor klanten van het bijhorende hotel/café/ziekenhuis/..."
                     },