Refactored Solr CollectionItem rebuilder for performance