Fix order for query string.