Refactor of cluster select and preselect