Fixed tree-table issues