Add countryid support and filename output by country id