refactored nested aggregate UI/query options to better reflect requirements