some more fixes to survey