Ensure reports work properly
Merge branch 'multi_bug_fix' into referral_fix