Fix the race condition causing search not to initialize properly

Fix the race condition causing search not to initialize properly #2617