Updates related to REPORTS-224

I made a few changes based on methods needed in REPORTS-224 ... I'll change to a different branch (instead of reusing DRUGHIST-7) after this one.