improved incremental indexing