Bugfixes to the Query API & wrapper option for Query.find & find_all.