Fixed various problems in event survey