Fix issues on survey page