Remove raw, mark original method return html_safe