Simplify event name detection
Use case-when
Add "unjoin" event