more html_safe fixes
Merge pull request #84 from extension/preview_html_fix

more html_safe fixes