-Swapped around the tree node name fallback so that entities fall back to type ID before entity ID
-Cleaned up sector entity type casting