async indexing, fixes