diff --git a/copy_this/admin/d3_country_geoip.php b/copy_this/admin/d3_country_geoip.php
index 15e2865..ce143ae 100644
--- a/copy_this/admin/d3_country_geoip.php
+++ b/copy_this/admin/d3_country_geoip.php
@@ -134,7 +134,17 @@ class d3_country_geoip extends oxAdminView
     {
         $aCurrencies = array();
 
-        $sQ = "select DECODE( oxvarvalue, '".$this->getConfig()->getConfigParam( 'sConfigKey' )."') as oxvarvalue from oxconfig where oxshopid = '".$this->oCountry->getFieldData('d3geoipshop')."' AND oxvarname = 'aCurrencies'";
+        if ($this->getModCfgValue('blChangeShop') && $this->oCountry->getFieldData('d3geoipshop'))
+        {
+            $sShopId = $this->oCountry->getFieldData('d3geoipshop');
+        }
+        else
+        {
+            $sShopId = $this->getConfig()->getActiveView()->getViewConfig()->getActiveShopId();
+        }
+
+        $sQ = "select DECODE( oxvarvalue, '".$this->getConfig()->getConfigParam( 'sConfigKey' )."') as oxvarvalue from oxconfig where oxshopid = '".$sShopId."' AND oxvarname = 'aCurrencies'";
+
         $sCurs = oxDb::getDb(2)->getOne($sQ);
         foreach (unserialize($sCurs) as $sKey => $sValue)
         {
@@ -149,10 +159,18 @@ class d3_country_geoip extends oxAdminView
 
     public function getLangList()
     {
+        if ($this->getModCfgValue('blChangeShop') && $this->oCountry->getFieldData('d3geoipshop'))
+        {
+            $sShopId = $this->oCountry->getFieldData('d3geoipshop');
+        }
+        else
+        {
+            $sShopId = $this->getConfig()->getActiveView()->getViewConfig()->getActiveShopId();
+        }
 
         $aLanguages = array();
-        $aLangParams = $this->getConfig()->getShopConfVar('aLanguageParams', $this->oCountry->getFieldData('d3geoipshop'));
-        $aConfLanguages = $this->getConfig()->getShopConfVar('aLanguages', $this->oCountry->getFieldData('d3geoipshop'));
+        $aLangParams = $this->getConfig()->getShopConfVar('aLanguageParams', $sShopId);
+        $aConfLanguages = $this->getConfig()->getShopConfVar('aLanguages', $sShopId);
 
         if ( is_array( $aConfLanguages ) ) {
             $i = 0;
diff --git a/sources/ToDo.txt b/sources/ToDo.txt
index 8880f0f..221af30 100644
--- a/sources/ToDo.txt
+++ b/sources/ToDo.txt
@@ -4,9 +4,4 @@ auch nicht aktive L
 IP-Syntaxcheck bei Eingabe im Admin
 MaxMind-CSV-Import
 
-IPV6-Pflege
-
-- metadata.php ohne Email und URL von D3
-- SQL ändern in (da OXREVISION hat keinen Standardwert)
-INSERT INTO `d3_cfg_mod` (`OXID`, `OXSHOPID`, `OXMODID`, `OXNAME`, `OXACTIVE`, `OXSERIAL`, `OXINSTALLDATE`, `OXVERSION`, `OXSHOPVERSION`, `OXISMODULELOG`, `OXREQUIREMENTS`, `OXVALUE`, `OXVALUE_1`, `OXVALUE_2`, `OXREVISION`, `OXNEWREVISION`) VALUES
-(MD5(RAND()), 'oxbaseshop', 'd3_geoip', 'GeoIP', 1, '', NOW(), '2.1.2', 'PE4', 0, '', '', '', '', 0, 26);
+IPV6-Pflege
\ No newline at end of file