Infinite loading loops at survey completion

Other ZBD issues: