Alter form to make single value fields for countries, instruments refs #...

...2321