BrowseTree refactoring