Improve the Query and Iter