Also, change filter expressions to look for IATA BCBP data directly, rather than their extractor results.