feat(query): substitute aggregation if request contains consolidateBy

[mchrome]

Substitute aggregation to the argument of consolidateBy if it was passed through FilteringFunctions field inside the request. Currently it just finds the first target matching the metric to avoid making multiple request for every type of aggregation for a given metric.