Improved search indexer