=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReportResult.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReportResult.vm	2012-10-31 16:02:05 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReportResult.vm	2012-11-22 04:49:16 +0000
@@ -17,7 +17,7 @@
     ["$!encoder.jsonEncode( ${suggestedValue} )"]
 	#if( $velocityCount < $suggestedValues.size() ),#end
     #end],
-    "name": "$!col.name",
+    "name": "$!encoder.jsonEncode($!col.name)",
     "hidden": "$!col.hidden"
   }#if( $velocityCount < $noHeader ),#end
   #set($index = $index + 1)
@@ -27,7 +27,7 @@
   #foreach( $row in $grid.getRows() )
   [
   #foreach( $col in $row )
-  "$!col"#if( $velocityCount < $noHeader ),#end
+  "$!encoder.jsonEncode($!col)"#if( $velocityCount < $noHeader ),#end
   #end
   ]#if( $velocityCount < $noRows ),#end
   #end