Towards grammar and transliteration indexing fix