[#878] Fix inexistent surveys check

* Refactor unused code (survey version Map)