Fix and properly test search indexer issues
Better indexing slice logic