[#878] Fix inexistent surveys check

* Refactor unused code (survey version Map)
I know its silly and very highly unlikely but perhaps still safer to check for a `null` `surveyGroupId` as well