Fix survey filters null keys
Merge branch 'MH-1001v2' into dev