Add four more solr fields, remove old code