fixed html character entity issues