Reworked show_aggregates option