optimize tree-select #284