Changed the Router to match against all possible versions of a route