Fixes #1478. Adds validation to field. Values must be in the store

Same comments as in previous PR, fix the formatting here.