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

...when they shouldn't.