Improve intree handling to (somewhat) handle cross-table hierarchies