fix suggestion form optional fields