fixed issues on import shipments query