temporary fix for AggregationQueryDSL name clash