Fix api querystring stuff