Fixed problem with ShipFrom state not being in output XML