Change js to escape text back into html to fix info view
Merge branch 'work'