Refactor solr client and add re-indexing