Quiz upgraded to handle diacritics