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

And also fix this line.