#4 : Search refactoring