fix zk-1698 mvvm tree performance