Search indexing improvements