Removing punctuation in subject terms
subject_display field is created solr-side
Post r5 branch merge adjustments