Transliterate chars for queries
Merge branch 'development' into integration