Merge pull request #2 from jordandukart/7.x-METRO-88

Update collection searching with configuration.
Update based upon what Dan found in QA.