don't set invalid country codes for #4820 #4864

Closed aksonov closed 4 years ago