[#878] Fix inexistent surveys check

* Refactor unused code (survey version Map)
Very valid point, it's harmless to add an extra check. I updated the branch with that fix. Let me know if the ternary operator is still readable.