[FEATURE query-params] Adjust query params param order
Merge pull request #3383 from alexspeller/query-params-adjust-param-order

Adjust query params param order