diff --git a/Models/Constants.ts b/Models/Constants.ts
index ebcd17212..bf95f3f27 100644
--- a/Models/Constants.ts
+++ b/Models/Constants.ts
@@ -2,7 +2,7 @@ import {Utils} from "../Utils";
 
 export default class Constants {
 
-    public static vNumber = "0.16.3";
+    public static vNumber = "0.16.4";
     
     public static ImgurApiKey = '7070e7167f0a25a'
     public static readonly mapillary_client_token_v4 = "MLY|4441509239301885|b40ad2d3ea105435bd40c7e76993ae85"
diff --git a/assets/layers/bicycle_rental/bicycle_rental.json b/assets/layers/bicycle_rental/bicycle_rental.json
index 57eee94cc..e79801b60 100644
--- a/assets/layers/bicycle_rental/bicycle_rental.json
+++ b/assets/layers/bicycle_rental/bicycle_rental.json
@@ -6,11 +6,15 @@
   },
   "source": {
     "osmTags": {
-      "or": [
-        "amenity=bicycle_rental",
-        "bicycle_rental~*",
-        "service:bicycle:rental=yes",
-        "rental~.*bicycle.*"
+      "and": [
+        {
+          "or": [
+            "amenity=bicycle_rental",
+            "bicycle_rental~*",
+            "service:bicycle:rental=yes",
+            "rental~.*bicycle.*"
+          ]
+        }
       ]
     }
   },
diff --git a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json
index 1040cfac4..df702c30b 100644
--- a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json
+++ b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json
@@ -203,7 +203,34 @@
         "bike_repair_station-valves"
       ]
     },
-    "bicycle_rental",
+    {
+      "builtin": [
+        "bicycle_rental"
+      ],
+      "override": {
+        "id": "charging_station_non_docking",
+        "minzoom": 14,
+        "source": {
+          "osmTags": {
+            "and+": [
+              "bicycle_rental!=docking_station"
+            ]
+          }
+        }
+      }
+    },
+    {
+      "#": "All bicycle rental at a high zoom level, to avoid duplicates",
+      "builtin": "bicycle_rental",
+      "override": {
+        "name": null,
+        "filter": {
+          "sameAs": "charging_station_non_docking"
+        },
+        "minzoom": 18
+      }
+    },
+    
     {
       "builtin": "playground",
       "override": {