Merge pull request #358 from CruGlobal/MH-1001v2

Fix survey filters null keys
Include multiple answers when the element is in object - survey filters
Merge branch 'MH-1001v3' into dev