Fixes: U4-5011 Auto collapsing tree structure