CRM-13329, event badge improvements