This moves the finder logic out of the component
Merge pull request #2569 from lreeves/group-selector-datasource-finder

Move finder logic out of the group-selector component