Improved the ability to maintain current selection in face of tree updates.