First step towards refactoring search navigation