fixes for template escaping
4 files changed