Coordinated Indexer and Searcher - bug fix, code reformat