diff --git a/src/Context/I18nContext.php b/src/Context/I18nContext.php
index 531a08d..00a2c83 100644
--- a/src/Context/I18nContext.php
+++ b/src/Context/I18nContext.php
@@ -145,9 +145,10 @@ public function getActiveLanguages(): array
 
             $languageData = $this->mapLanguageInfo($site->getLocale(), $site->getUrl());
             $languageData['linkedHref'] = $site->getUrl();
-            $languageData['active'] = $site->getLanguageIso() === $this->localeDefinition->getLanguageIso();
+            $languageData['active'] = $site->getLocale() === $this->localeDefinition->getLocale();
+
             foreach ($linkedLanguages as $linkedLanguage) {
-                if ($linkedLanguage['languageIso'] === $site->getLanguageIso()) {
+                if ($linkedLanguage['locale'] === $site->getLocale()) {
                     $languageData['linkedHref'] = $linkedLanguage['url'];
 
                     break;
@@ -192,6 +193,7 @@ public function getActiveCountries(): array
         $countryData = [];
         if (!empty($validCountries)) {
             foreach ($validCountries as $country) {
+
                 if (is_null($country['isoCode'])) {
                     continue;
                 }
diff --git a/tests/FunctionalDefault/ActiveLocalesCest.php b/tests/FunctionalDefault/ActiveLocalesCest.php
new file mode 100644
index 0000000..117bb73
--- /dev/null
+++ b/tests/FunctionalDefault/ActiveLocalesCest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace DachcomBundle\Test\FunctionalDefault;
+
+use DachcomBundle\Test\Support\FunctionalTester;
+
+class ActiveLocalesCest
+{
+    public function testActiveLanguagesSelector(FunctionalTester $I): void
+    {
+        $site = $I->haveASite('test-domain1.test');
+
+        $document1 = $I->haveAPageDocumentForSite($site, 'de', ['action' => 'languageSelectorAction'], 'de');
+        $document2 = $I->haveAPageDocumentForSite($site, 'en', ['action' => 'languageSelectorAction'], 'en');
+
+        $I->haveTwoConnectedDocuments($document1, $document2);
+
+        $I->amOnPageWithLocale('http://test-domain1.test/en', 'en');
+
+        $I->seeElement('select option[selected][value="http://test-domain1.test/en"]');
+    }
+
+    public function testActiveCountriesSelector(FunctionalTester $I): void
+    {
+        $site = $I->haveASite('test-domain1.test');
+
+        $document1 = $I->haveAPageDocumentForSite($site, 'de', ['action' => 'languageCountrySelectorAction'], 'de');
+        $document2 = $I->haveAPageDocumentForSite($site, 'en', ['action' => 'languageCountrySelectorAction'], 'en');
+
+        $I->haveTwoConnectedDocuments($document1, $document2);
+
+        $I->amOnPageWithLocale('http://test-domain1.test/en', 'en');
+
+        $I->seeElement('li[data-country="GLOBAL"] li[data-language="en"]');
+    }
+}
diff --git a/tests/FunctionalDefaultCountry/ActiveLocalesCest.php b/tests/FunctionalDefaultCountry/ActiveLocalesCest.php
new file mode 100644
index 0000000..a1a0ec8
--- /dev/null
+++ b/tests/FunctionalDefaultCountry/ActiveLocalesCest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace DachcomBundle\Test\FunctionalDefaultCountry;
+
+use DachcomBundle\Test\Support\FunctionalTester;
+
+class ActiveLocalesCest
+{
+    public function testActiveLanguagesSelector(FunctionalTester $I): void
+    {
+        $site = $I->haveASite('test-domain1.test');
+
+        $document1 = $I->haveAPageDocumentForSite($site, 'de-de', ['action' => 'languageSelectorAction'], 'de_DE');
+        $document2 = $I->haveAPageDocumentForSite($site, 'de-ch', ['action' => 'languageSelectorAction'], 'de_CH');
+
+        $I->haveTwoConnectedDocuments($document1, $document2);
+
+        $I->amOnPageWithLocale('http://test-domain1.test/de-de', 'de');
+
+        $I->seeElement('select option[selected][value="http://test-domain1.test/de-de"]');
+    }
+
+    public function testActiveCountriesSelector(FunctionalTester $I): void
+    {
+        $site = $I->haveASite('test-domain1.test');
+
+        $document1 = $I->haveAPageDocumentForSite($site, 'de-de', ['action' => 'languageCountrySelectorAction'], 'de_DE');
+        $document2 = $I->haveAPageDocumentForSite($site, 'de-ch', ['action' => 'languageCountrySelectorAction'], 'de_CH');
+
+        $I->haveTwoConnectedDocuments($document1, $document2);
+
+        $I->amOnPageWithLocale('http://test-domain1.test/de-ch', 'de');
+
+        $I->seeElement('li[data-country="CH"] li[data-language="de"]');
+    }
+}
diff --git a/tests/_etc/config.yaml b/tests/_etc/config.yaml
index c88ae0e..b994bbc 100644
--- a/tests/_etc/config.yaml
+++ b/tests/_etc/config.yaml
@@ -10,6 +10,7 @@ setup_files:
     - { path: app/controller/DefaultController.php, dest: ./src/Controller/ }
     - { path: app/templates/default.html.twig, dest: ./templates/default/ }
     - { path: app/templates/language-selector.html.twig, dest: ./templates/default/ }
+    - { path: app/templates/country-selector.html.twig, dest: ./templates/default/ }
 preload_files:
     - { path: Services/TestAlternateListener.php }
     - { path: Services/TestLinkGenerator.php }
diff --git a/tests/_etc/config/app/controller/DefaultController.php b/tests/_etc/config/app/controller/DefaultController.php
index aa3bbb7..776ca5c 100644
--- a/tests/_etc/config/app/controller/DefaultController.php
+++ b/tests/_etc/config/app/controller/DefaultController.php
@@ -25,4 +25,9 @@ public function languageSelectorAction(Request $request): Response
     {
         return $this->render('default/language-selector.html.twig');
     }
+
+    public function languageCountrySelectorAction(Request $request): Response
+    {
+        return $this->render('default/country-selector.html.twig');
+    }
 }
diff --git a/tests/_etc/config/app/templates/country-selector.html.twig b/tests/_etc/config/app/templates/country-selector.html.twig
new file mode 100644
index 0000000..0ca3133
--- /dev/null
+++ b/tests/_etc/config/app/templates/country-selector.html.twig
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html lang="{{ app.request.locale }}">
+<head>
+    <meta charset="UTF-8">
+    <title>Test Page for I18n</title>
+    {{ pimcore_head_meta() }}
+    {{ pimcore_head_link() }}
+</head>
+<body>
+    <div id="site">
+        {% set current_context = i18n_current_context() %}
+        {% if current_context is not null %}
+            {% set countries = current_context.activeCountries %}
+            {% if countries is iterable %}
+                <nav id="navigation">
+                    {% for country in countries %}
+                        <ul>
+                            <li class="country" data-country="{{ country.country.isoCode }}">{{ country.countryTitle }}
+                                <ul class="languages">
+                                    {% for language in country.languages %}
+                                        <li data-language="{{ language.iso }}" {{ language.active ? ' class="active"' : '' }}><a href="{{ language.linkedHref }}">{{ language.iso|upper }}</a></li>
+                                    {% endfor %}
+                                </ul>
+                            </li>
+                        </ul>
+                    {% endfor %}
+                </nav>
+            {% endif %}
+        {% endif %}
+
+        <div class="navigation">
+            {% set menu = pimcore_build_nav({
+                active: document,
+                root: document,
+                cache: app.request.locale
+            }) %}
+
+            {{ pimcore_render_nav(menu, 'menu', 'renderMenu', {
+                maxDepth: 10,
+                ulClass: 'nav navbar-nav'
+            }) }}
+        </div>
+        <div class="content">
+            {% if document is defined %}
+                <span id="page-id">{{ document.id }}</span>
+            {% endif %}
+        </div>
+        {% block content %}
+            {{ pimcore_areablock('dachcomBundleTest') }}
+        {% endblock %}
+    </div>
+</body>
+</html>