Improve filtering for join/leave/quit