Added html escaping