Issue #1962358 by grom358: Replaced use of entity_label and entity_uri