change test
Refactor search
Merge branch 'refactorSearch'