Bug fix with QueryString calls