Server now handles special characters more reliable