Report performance improvements merge from master

Changes to the ReportGenerator class for the new tags API and Jeff Wallace's report performance improvements required a hand merge.