Fix issue with cluster logic for popups.