Fix to remove encoded &nbsp;