Update type choices to match value with option
Update contact template