added non-paginated-query option