Add default HTML escaping
Add additional parameters to template functions