forms: Always attempt to look up selection value by name

Fixes #737