Fixes for entity adding

StructureTree now shows proper entity tags and contents