Fix expand/collapse all