changed q-collection to q-dataset
added group-by
added group by
added logic for null operation