|#1161| +Manan| Fixing logic for highlighting required fields