Ajay/Melanie/Pooja | #3910 | Updated ft scenario for single select