Issue ID #33 Indexing no longer locks main thread