Fix out of order fields in route definitions

[ealmloff]

This PR fixes parsing for routes that have fields in the route string in a different order than they were defined in the enum variant

Fixes #2353