changed q-collection to q-dataset
added group by