[geolocation] Fixes for bugs 1029326 and 1022635

`er` is a valid country code apparently. https://en.wikipedia.org/wiki/Eritrea

`zy` is maybe a better choice. here's a full list including unused codes https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#ZY