Updated to allow underscore inside html views