route, person, search refactoring