Grouped options

https://trello.com/c/F53ywENK/4429-report-builder
Changed here and on two different spots as well.