Update survey-saved tempalte to be at least more defensive
Remove unneccessary marker call