Shipment email notification issue fixes