Add fields to the aggregate JSON

It would be helpful to the analytics team to have the same fields in the aggregate JSON that are in the individual JSONs.  This is a higher priority than working on the RDF, but lower than the issues with bug fixes.