Fix `Leave` and `Join` matches functionality