Ajay/Pooja | #2857 | Retaining earlier nonselect fields as is