Update forms to use multiple form fields per search type rather than comma separated strings.

[jchate6]

This will make maintenance and user experience much better.