Bugfix: correct cluster popups.