Fixed bug with duplicate entity IDs

Removed unnecessary tree update.
Fixed focus getting stuck in entity boundary