Fixed issue with cluster view