Use the keys of the collectionData to filter against since they don't have to be consecutive
Merge branch 'hotfix/4516'

Close #4516