Added handling of diacritics
Improved author handling