Issue #18833: Refactoring in picker selection