Refactor trending report
#694 was unable to reproduce