Fix bug: the hierarchy name of the aggregation should have the name of the hierarchy where we do the actual aggregation.