Cs 4645 improve solr indexer