Merge pull request #391 from CruGlobal/MH-1048

Fix the construction of query condition in interactions
Unlock predefined question in new mass entry fields
Merge branch 'master' into dev
Merge branch 'MH-853' into dev