Add new tree bits to automake
Maintain Expansion/Selection when sorting