more fixes to survey