issue #21368: Missed some spots. Also make picker friendlier.
Add constraints to prevent data corruption.
Merge pull request #46 from jrogelstad/21368

Misc.