added the rest of survey fields to form, survey DB save and fetch