[risk=no] Bug fixes for loading tree (#1374)
[risk=no] Bug fixes for loading tree (#1374)

* fixed bugs for loading tree

* fixed bugs for loading tree

all-of-us/workbench,all-of-us/workbench,all-of-us/workbench,all-of-us/workbench,all-of-us/workbench,all-of-us/workbench,all-of-us/workbench,all-of-us/workbench,all-of-us/workbench