Fix query string order