html_safe fixes