Fix Bug 936492, implement tree selector for multi tree support

@erikrose r?