Fix query string params again