Issue #218 - improvements to implementation of surveyInstanceDao