correct escaping in templates (pt.2)