added escapes in some template outputs