Added character escaping on display names