html_safe some escaped HTML
Fix more routes and escaped HTML