[#232] Get rid of tmp hack

* Preserve survey group original data