Post expand and collapse now works fully