removed html entity conversion