LILY-329 convert formsets to fields