Improved entity functionality in structure tree.

Also removed a console.log call.