Improved tree selection.