Pull request for tech-debt/2/refactor-cluster-popup

Refactored the logic for identifying an event that is in a cluster.