Updated and extended collective plurals check