Added survey unpublish confirmation.
Code refactoring