Refactoring, fixing error affecting export of links

To test, set an alternate field for exporting, in a linked selectbox.  Export and make sure you get that field.  Turn off alternate field, make sure export still works.  This is not Selenium testable because exports are excel sheets.

Also worth testing in Selenium...alternate fields for display in list work as expected.