Fix Query Collection Completeness Check