Index: trunk/src/org/openstreetmap/josm/tools/template_engine/Condition.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/template_engine/Condition.java	(revision 11056)
+++ trunk/src/org/openstreetmap/josm/tools/template_engine/Condition.java	(revision 11057)
@@ -41,5 +41,5 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("?{");
+        sb.append("?{ ");
         for (TemplateEntry entry: entries) {
             if (entry instanceof SearchExpressionCondition) {
@@ -48,6 +48,8 @@
                 sb.append('\'').append(entry).append('\'');
             }
-            sb.append('|');
+            sb.append(" | ");
         }
+        sb.setLength(sb.length() - 3);
+        sb.append(" }");
         return sb.toString();
     }
Index: trunk/src/org/openstreetmap/josm/tools/template_engine/Variable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/template_engine/Variable.java	(revision 11056)
+++ trunk/src/org/openstreetmap/josm/tools/template_engine/Variable.java	(revision 11057)
@@ -56,5 +56,5 @@
     @Override
     public String toString() {
-        return '{' + variableName + '}';
+        return '{' + (special ? SPECIAL_VARIABLE_PREFIX : "") + variableName + '}';
     }