Fixed survey bug, highlighted by the smoke tests.

Not certain but the bug may have surfaced because of the change to lazy tables. Anyway, fairly easy to fix :)