Notice#served_by split into two form fields

This was done as part of the copy changes drive