More improvements to QueryString