Fixed html entities issue