updated htmlentities