Fix up data passing for subitem matches.