More tweaks to survey