issue #22901: Fix problem on picker where not found values were setting when they shouldn't.
Merge pull request #1311 from jrogelstad/22901

issue #22901: Fix problem on picker where not found values were setting ...