Revert "Revert "Change control to search multiple times""

This reverts commit 7d50ef9d3d021024ad394046735fd8ef305f6561.