TemplateHelper: be more accepting of broken entities in templates
Added annotation