Grouped options

https://trello.com/c/F53ywENK/4429-report-builder
Why did you remove this two? They're still used in the code.