Got the aggregations constrained to the proper document set.
Updated the mapping table to use nested documents.