corrected bug where expand all and collapse all were part of second form