fixes for non Latin entries