Ajay | #3831 | Correcting logic - validate key part instead of choice label