More improvements to multiple collapsed mode changes