pull request issues
Remove html_safe