Fix for adding names with special characters to WatchList