Bugfixes for 404 errors in the trees
Merge branch 'APD-48-hla-tree2' into develop