Fix search after refactoring.