search form, fixes to edit form