Fix Expand All functionality