Redo the helpers a bit so the default is text and shown in the select