Fix search contacts to be assigned in add question
Fix conflicts after merging MH-602 to dev