Collapse/expand issues fix