update poll/survey logic to avoid cache problems