Bug fixes for remove from solr