CORE-347 tree items improvements