Fixing csv reports.  Moving escaping into the template since otherwise we have double escaping problems.