entity hierarchy now based on NamedEntity