Refactor add survey controller a bit