IteratorQuery improved