QueryString fixes