diff --git a/pt_amenities.json b/pt_amenities.json
index 7d8d9217..7d30a471 100644
--- a/pt_amenities.json
+++ b/pt_amenities.json
@@ -17,12 +17,8 @@
     "query": {
         "14": [
             "(",
-            "node[amenity~\"^(taxi|ticket_counter)$\"];",
-            "way[amenity~\"^(taxi|ticket_counter)$\"];",
-            "relation[amenity~\"^(taxi|ticket_counter)$\"];",
-            "node[railway~\"^(subway_entrance)$\"];",
-            "way[railway~\"^(subway_entrance)$\"];",
-            "relation[railway~\"^(subway_entrance)$\"];",
+            "nwr[amenity~\"^(taxi|ticket_counter)$\"];",
+            "nwr[railway~\"^(subway_entrance)$\"];",
             ")"
         ]
     },