Improved selection in Tree