RF-12769: fix for Select with manual input - used first option regardless of what is picked