session: Refactor select_service