#4658 - null values for countryId and value always showed