Updated router to route correctly including wildcards