Feature #2778: Fix cluster dropdown