Better handling of cyrillic letters

Change-Id: I8a672ae3d123d3a9f5713852767a0a78c058dd3e