Improved tree selector.