[HU-100] Modified code to fix checkbox and radio button persistence issue.