Fixed Solr (ADW-719)