finish refactoring solr field names out to constants