Refactored Solr-StoreSearch implementation