Refactoring search word. #2