Fix survey form
Merge branch 'ozamasa-master'