Replace global activeSurvey$ w/component inputs
#2301
Merged
activeSurvey$ w/component inputs
#2301