Dramatic performance improvements for search index (#517)