CORE-3969: correctly handle display names containing empty strings