Update control types to allow text values

Refs #739