Fix up matcher to account for change in data structure

Aggregate CC XML would have a different output