Index: trunk/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java	(revision 15811)
+++ trunk/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java	(revision 15814)
@@ -31,7 +31,5 @@
                 "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
                 "(\n" +
-                "  node[\"amenity\"=\"drinking_water\"];\n" +
-                "  way[\"amenity\"=\"drinking_water\"];\n" +
-                "  relation[\"amenity\"=\"drinking_water\"];\n" +
+                "  nwr[\"amenity\"=\"drinking_water\"];\n" +
                 ");\n" +
                 "(._;>;);\n" +
@@ -48,7 +46,5 @@
                 "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
                 "(\n" +
-                "  node[\"amenity\"!=\"drinking_water\"];\n" +
-                "  way[\"amenity\"!=\"drinking_water\"];\n" +
-                "  relation[\"amenity\"!=\"drinking_water\"];\n" +
+                "  nwr[\"amenity\"!=\"drinking_water\"];\n" +
                 ");\n" +
                 "(._;>;);\n" +
@@ -64,7 +60,5 @@
                 "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
                 "(\n" +
-                "  node[\"foo\"=\"bar\"][\"baz\"=\"42\"];\n" +
-                "  way[\"foo\"=\"bar\"][\"baz\"=\"42\"];\n" +
-                "  relation[\"foo\"=\"bar\"][\"baz\"=\"42\"];\n" +
+                "  nwr[\"foo\"=\"bar\"][\"baz\"=\"42\"];\n" +
                 ");\n" +
                 "(._;>;);\n" +
@@ -83,10 +77,6 @@
                 "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
                 "(\n" +
-                "  node[\"foo\"=\"bar\"];\n" +
-                "  way[\"foo\"=\"bar\"];\n" +
-                "  relation[\"foo\"=\"bar\"];\n" +
-                "  node[\"baz\"=\"42\"];\n" +
-                "  way[\"baz\"=\"42\"];\n" +
-                "  relation[\"baz\"=\"42\"];\n" +
+                "  nwr[\"foo\"=\"bar\"];\n" +
+                "  nwr[\"baz\"=\"42\"];\n" +
                 ");\n" +
                 "(._;>;);\n" +
@@ -106,16 +96,8 @@
                 "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
                 "(\n" +
-                "  node[\"foo\"][\"asd\"];\n" +
-                "  way[\"foo\"][\"asd\"];\n" +
-                "  relation[\"foo\"][\"asd\"];\n" +
-                "  node[\"foo\"][\"fasd\"];\n" +
-                "  way[\"foo\"][\"fasd\"];\n" +
-                "  relation[\"foo\"][\"fasd\"];\n" +
-                "  node[\"bar\"][\"asd\"];\n" +
-                "  way[\"bar\"][\"asd\"];\n" +
-                "  relation[\"bar\"][\"asd\"];\n" +
-                "  node[\"bar\"][\"fasd\"];\n" +
-                "  way[\"bar\"][\"fasd\"];\n" +
-                "  relation[\"bar\"][\"fasd\"];\n" +
+                "  nwr[\"foo\"][\"asd\"];\n" +
+                "  nwr[\"foo\"][\"fasd\"];\n" +
+                "  nwr[\"bar\"][\"asd\"];\n" +
+                "  nwr[\"bar\"][\"fasd\"];\n" +
                 ");\n" +
                 "(._;>;);\n" +
@@ -148,10 +130,6 @@
                 "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
                 "(\n" +
-                "  node(user:\"foo\");\n" +
-                "  way(user:\"foo\");\n" +
-                "  relation(user:\"foo\");\n" +
-                "  node(uid:42);\n" +
-                "  way(uid:42);\n" +
-                "  relation(uid:42);\n" +
+                "  nwr(user:\"foo\");\n" +
+                "  nwr(uid:42);\n" +
                 ");\n" +
                 "(._;>;);\n" +
@@ -184,7 +162,5 @@
                 "{{geocodeArea:Josmland}}->.searchArea;\n" +
                 "(\n" +
-                "  node[\"foo\"=\"bar\"](area.searchArea);\n" +
-                "  way[\"foo\"=\"bar\"](area.searchArea);\n" +
-                "  relation[\"foo\"=\"bar\"](area.searchArea);\n" +
+                "  nwr[\"foo\"=\"bar\"](area.searchArea);\n" +
                 ");\n" +
                 "(._;>;);\n" +
@@ -202,7 +178,5 @@
                 "[out:xml][timeout:90];\n" +
                 "(\n" +
-                "  node[\"amenity\"=\"hospital\"];\n" +
-                "  way[\"amenity\"=\"hospital\"];\n" +
-                "  relation[\"amenity\"=\"hospital\"];\n" +
+                "  nwr[\"amenity\"=\"hospital\"];\n" +
                 ");\n" +
                 "(._;>;);\n" +