Improve unexpand tree behavior