countries: index: improve country shapes, resolve #28