Readme
Search refactoring