Rolled back escaping of data as it will cause too many issues downstream. Fixes for the escaping now occur at presentation level