Fix survey filter results for kaminari issue
Fix sorting
Fix my contacts counting
Merge branch 'MH-975' into dev