Cleanup query string