Refactoring serch -> search