Fix tree selection for release 2