BBL-528 Added origin and desitnation airport ids