fixed html entity encoding issue