Fixed html entities problem