yotam: Minor fix-ups for deployment 4, change fields in attachment to textField