More fixes so that the survey will redirect on quotafull, and properly
bounce back to ResearchNow in event of screenout and completion.