improved use of query methods #86