Fix issue with query param aggregation