Added some html escaping