Refs #4569 Tweak to message + display as raw for segment names with entities to display ok