Update gender value in the database as consistency and fix the filter by gender
Merge branch 'MH-1024' into dev