#1225 - Ashok/Kavitha - Fixed some of the feature related to form_section