diff --git a/car_amenities.json b/car_amenities.json
index 97e47da..e5fbbc1 100644
--- a/car_amenities.json
+++ b/car_amenities.json
@@ -17,18 +17,14 @@
     "query": {
         "13": [
             "(",
-            "node[amenity~\"^(car_rental|car_sharing|fuel)$\"];",
-            "way[amenity~\"^(car_rental|car_sharing|fuel)$\"];",
-            "relation[amenity~\"^(car_rental|car_sharing|fuel)$\"];",
-            "node[amenity~\"^(charging_station)$\"][car!=\"no\"];",
-            "node[amenity~\"^(charging_station)$\"][motorcycle!=\"no\"];",
+            "nwr[amenity~\"^(car_rental|car_sharing|fuel)$\"];",
+            "nwr[amenity~\"^(charging_station)$\"][motorcar!=\"no\"][motorcycle!=\"no\"];",
             ")"
         ],
         "16": [
             "(",
-            "node[amenity~\"^(car_rental|car_sharing|car_wash|charging_station|fuel|motorcycle_parking|parking)$\"];",
-            "way[amenity~\"^(car_rental|car_sharing|car_wash|charging_station|fuel|motorcycle_parking|parking)$\"];",
-            "relation[amenity~\"^(car_rental|car_sharing|car_wash|charging_station|fuel|motorcycle_parking|parking)$\"];",
+            "nwr[amenity~\"^(car_rental|car_sharing|car_wash|fuel|motorcycle_parking|parking)$\"];",
+            "nwr[amenity~\"^(charging_station)$\"][motorcar!=\"no\"][motorcycle!=\"no\"];",
             ")"
         ]
     },
diff --git a/cycle_amenities.json b/cycle_amenities.json
index e38afff..50a0ac5 100644
--- a/cycle_amenities.json
+++ b/cycle_amenities.json
@@ -13,7 +13,7 @@
             "node[amenity~\"^(bicycle_rental)$\"];",
             "way[amenity~\"^(bicycle_rental)$\"];",
             "relation[amenity~\"^(bicycle_rental)$\"];",
-            "node[amenity~\"^(charging_station)$\"][bicycle!=\"no\"];",
+            "node[amenity~\"^(charging_station)$\"][bicycle][bicycle!=\"no\"];",
             "node[shop~\"^(bicycle)$\"];",
             "way[shop~\"^(bicycle)$\"];",
             "relation[shop~\"^(bicycle)$\"];",
@@ -24,7 +24,7 @@
             "node[amenity~\"^(bicycle_.*|compressed_air)$\"];",
             "way[amenity~\"^(bicycle_.*|compressed_air)$\"];",
             "relation[amenity~\"^(bicycle_.*|compressed_air)$\"];",
-            "node[amenity~\"^(charging_station)$\"][bicycle!=\"no\"];",
+            "node[amenity~\"^(charging_station)$\"][bicycle][bicycle!=\"no\"];",
             "node[shop~\"^(bicycle)$\"];",
             "way[shop~\"^(bicycle)$\"];",
             "relation[shop~\"^(bicycle)$\"];",