Prevent empty values in the returned country names