Changed shipment view to avoid nulls