fix to shipments selection