Add countries to metadata getter

Fixes #650
Fixes #649