Fix survey filter in specific answers
Merge branch 'MH-1019' into dev