Refactored the searchindexing service