Index: trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java	(revision 4721)
+++ trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java	(revision 4724)
@@ -171,5 +171,5 @@
             List<OsmPrimitive> lhsList = lhs.getPrimitives(root);
             for (OsmPrimitive o: rhs.getPrimitives(root)) {
-                if (lhsList.contains(o) && condition == null && condition.match(o)) {
+                if (lhsList.contains(o) && (condition == null || condition.match(o))) {
                     result.add(o);
                 }