Adding back options.html_safe now that database is populated