*8235* Refactor search indexing into core