Issue #416 - Fix regression problem with Survey dropdown

* The data-binding for the selected survey was changed. We now use the
 `selectedControl` for picking the surveyId