Add countries to metadata getter

Fixes #650
Fixes #649
Merge pull request #653 from adamrp/fix_metadata_getter

Add countries to metadata getter