swuird fixes

@lmcglohon @lauraw15 @bess 

Laney:  this is for you to do a fast forward merge on the swuird branch.   

It takes care of a number of issues with the changes to the format facet field name and its values.   There may be more work to do, but it reduced the number of errors greatly;  it's down to 22, largely in three collections and with maybe 3 individual records seemingly in a weird state.