Tree main display
Search improved