CRM-13966 - Improve event selection in reports