Fixed expand capability in the Entity graph