Fix up tree rendering of scans and structures