Improved search index