APD-582: Tree container expandable