Fix parameter ordering issue

[Beffyman]

Currently Route & Query parameters are ordered (Route, Route Nullabe, Query, Query Nullable) There can be a case where a nullable route param causes a compile error due to a non-nullable query param