Ensure reports use nested group selector and remove boilerplate
Re-order country/state/county to make more sense with chainselect
Merge pull request #3907 from colemanw/reports

UI improvements for reports