Merge "Revert "Revert "Use the Finder's results for faster searching"""