added non html character escaping