Broken query string fix