Survey save bug fix