Revert "Change control to search multiple times"

This reverts commit 007870c1411fce216a2600b310bcd674dbabc776.