Improve handling of gender for unknown models