- deprecate and update some entity tags (#10932)