Improvements to surveys admin
SD-55978914-Refactor filtering