Make search-index rebuild -r and rebuild_fast faster

Test on my machine with about 3K datasets completed almost 80% faster with these changes