Survey logic fixes.