Updated Cruise matching and added Find Gazetteer code