added support for the country sub tag and related tests