fixes in collapse all