Fix default indexing to always provide direct lexical values for search ease.