Handle multiple events and versions of surveys #2888
Also addresses #3536