Fixed add to male/female list saving     Ticket: GCP-9363    Reviewer: To be reviewed by Jai