Fix inconsistency on FilterGroupsByGender
Readability improvements