Fix issue with sorting by shipment number