Updated survey section with caching and re-organization.