CRM-13327, event badge fixes