Tree-view performance fix