Select fields in advanced search and minor test cleanup.

need to change to contributing_office_list (to reduce confusion)