fixes for new cluster, sort