Index: /trunk/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java	(revision 16335)
+++ /trunk/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java	(revision 16336)
@@ -12,4 +12,5 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -89,7 +90,8 @@
             final EnumSet<OsmPrimitiveType> types = EnumSet.noneOf(OsmPrimitiveType.class);
             final String query = constructQuery(conjunction, types);
-            for (Object type : types.isEmpty() || types.size() == 3 ? Collections.singleton("nwr") : types) {
-                queryLines.add("  " + type + query + queryLineSuffix + ";");
-            }
+            final Stream<String> typeStream = types.isEmpty() || types.size() == 3
+                    ? Stream.of("nwr")
+                    : types.stream().map(OsmPrimitiveType::getAPIName);
+            typeStream.forEach(type -> queryLines.add("  " + type + query + queryLineSuffix + ";"));
         }
         queryLines.add(");");
Index: /trunk/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java	(revision 16335)
+++ /trunk/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java	(revision 16336)
@@ -20,5 +20,5 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().timeout(15000);
+    public JOSMTestRules test = new JOSMTestRules().i18n("de");
 
     private void assertQueryEquals(String expectedQueryPart, String input) {