more html_safe fixes