search routing refactoring
search routing refactoring