fixed new type_or_ent type handling