[FEATURE query-params] Adjust query params param order