Field name is asummed to be HTML Safe
Merge branch 'hotfix/html_safe_name'