Fix for cyrillic characters and little housekeeping ("concernization")