Hidden filled fields when switching Aggregation

[limitednl]

When switching from an aggregated to a non-aggregated query, filled aggregation fields remain filled and present. However, the interface hides these fields in attribute elements. This way you cant use the interface to clear these values. You have to fall-back to editing the fetch-xml or switch aggregation back on.

Is it possible to clear these fields when turning aggregation off? Or make the hiding of these fields optional in the settings?