[FIX] survey: regressions introduced in forward-port fd4fd35e3239c771ab9d692f47f61770ae882965