Rearrange query params