Switch company organization to multivalue.
Replace brittle and buggy field_search_field code with proper abstracted code.