Switch from html_safe to raw