Improve filtering for matching listeners