#93745 improvements to structure and layer tree control