Revert "Revert "Search first""

This reverts commit 7dd16bae525de99e3766e96ad8698862c78aa9d1.