Changed to filter the country using shipping address, not billing.