YAML changes for #342

Attempt to make topic selection happen first so that the rest of the
contact form is displayed.