Refactored the logic for identifying an event that is in a cluster.
Fix issue with cluster logic for popups.
Merge pull request #26 from ozone-development/tech-debt/2/refactor-cluster-popup

Tech debt/2/refactor cluster popup