=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.java	2010-09-24 06:12:10 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.java	2010-11-29 17:19:06 +0000
@@ -68,6 +68,7 @@
     private static final String NULL_REPLACEMENT = "0";
     private static final String FORMULA_EXPRESSION = "(\\[\\d+\\" + SEPARATOR + "\\d+\\])";
     private static final String DESCRIPTION_EXPRESSION = "\\[.+?\\" + SEPARATOR + ".+?\\]";
+    private static final String SPACE = " ";
     
     private final Pattern FORMULA_PATTERN = Pattern.compile( FORMULA_EXPRESSION );
     private final Pattern DESCRIPTION_PATTERN = Pattern.compile( DESCRIPTION_EXPRESSION );
@@ -354,7 +355,7 @@
                 
                 if ( !categoryOptionCombo.isDefault() )
                 {
-                    replaceString += SEPARATOR + categoryOptionCombo.getName();
+                    replaceString += SPACE + categoryOptionCombo.getName();
                 }
 
                 matcher.appendReplacement( buffer, replaceString );