Bug fixes (large and small) for new survey functionality