Refactor router to eliminate unnecessary fetch