Optimizes hierarchy behavior<br />Fixes bugs in Hierarchy view<br><br />