Fixed the checkboxes in NewQuery