Fix Survey validation