Some minor changes to show the aggregates. Also, we have changed a little the save-query method
Changes in the query generator submethods. We work now with sets instead of lists to solve the problem of repeated values.