Fix one-step search.