Comments fix when editing a form