Better query string formatting