Fix slow ActivityReport.
Merge pull request #368 from jfurlong/oe4.1.1

Fix slow ActivityReport.