[imp] improve the processing of incomming shipments