car_amenities: improve queries for charging stations

car_amenities.json

@@ -18,13 +18,15 @@
         "13": [
             "(",
             "nwr[amenity~\"^(car_rental|car_sharing|fuel)$\"];",
-            "nwr[amenity~\"^(charging_station)$\"][motorcar!=\"no\"][motorcycle!=\"no\"];",
+            "nwr[amenity~\"^(charging_station)$\"][motorcar][motorcar!=\"no\"];",
+            "nwr[amenity~\"^(charging_station)$\"][motorcycle][motorcycle!=\"no\"];",
             ")"
         ],
         "16": [
             "(",
             "nwr[amenity~\"^(car_rental|car_sharing|car_wash|fuel|motorcycle_parking|parking)$\"];",
-            "nwr[amenity~\"^(charging_station)$\"][motorcar!=\"no\"][motorcycle!=\"no\"];",
+            "nwr[amenity~\"^(charging_station)$\"][motorcar][motorcar!=\"no\"];",
+            "nwr[amenity~\"^(charging_station)$\"][motorcycle][motorcycle!=\"no\"];",
             ")"
         ]
     },