use to_s on entity instead of explicit call.
always replace _ with whitespace for display name.
Merge branch '725-entity_display_name_issue' into develop