use to_s on entity instead of explicit call.
always replace _ with whitespace for display name.
Merge pull request #736 from ontohub/725-entity_display_name_issue

725 entity display name issue