Minor TreeView optimization and UI-locking avoidance