Added back aggr query