fixing cluster expand actions

making it so adding a cluster to a cluster collapses it and removing
from a cluster expands it