fixed HTML5-related issues - escaped chars