+ proper query and iterator