Cluster search improved