clusters popup 6

Fixed getting selected cluster number under these new conditions