Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItemGuiSupportTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItemGuiSupportTest.java	(revision 17873)
+++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItemGuiSupportTest.java	(revision 17876)
@@ -37,4 +37,5 @@
     void testTemplate() throws Exception {
         ArrayList<Tag> tags = new ArrayList<>(Arrays.asList(
+                new Tag("route", "bus"),
                 new Tag("name", "xxx"),
                 new Tag("from", "Foo"),
@@ -46,4 +47,6 @@
         TemplateEntry templateEntry = new TemplateParser("Bus {ref}: {from} -> {to}").parse();
         assertEquals("Bus 42: Foo -> Bar", templateEntry.getText(support));
+        templateEntry = new TemplateParser("?{route=train 'Train'|route=bus 'Bus'|'X'} {ref}: {from} -> {to}").parse();
+        assertEquals("Bus 42: Foo -> Bar", templateEntry.getText(support));
     }
 }