Got Surveys working except for the first request.
fixed confilct