Added some more html character escaping