Solr schema overhaul