Feature/aggregation filter update

Fleshed out aggregation support in format_args method.