Return query in response

Hi,
This adds a little bit of overhead to every query response, but it is very useful when issuing multiple queries. Indeed in the current version it is impossible to distinguish responses if queries are made to the same metric, but with different aggregators.