Fix solr handlers