Better handling of female surname inflection and company name abbreviations