More refactoring
Search work