Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 7307)
+++ /controller/wpsg_ShopController.class.php	(revision 7308)
@@ -3554,5 +3554,5 @@
 			$arReplace['/%shopinfo_zip%/i'] = $this->get_option('wpsg_shopdata_zip');
 			$arReplace['/%shopinfo_city%/i'] = $this->get_option('wpsg_shopdata_city');		
-			$arReplace['/%shopinfo_country%/i'] = $this->get_option('wpsg_shopdata_country');
+			$arReplace['/%shopinfo_country%/i'] = $this->getDefaultCountry()->getName();
 			
 			$arReplace['/%shopinfo_2_street%/i'] = $this->get_option('wpsg_shopdata_2_street');
Index: /lib/wpsg_basket.class.php
===================================================================
--- /lib/wpsg_basket.class.php	(revision 7307)
+++ /lib/wpsg_basket.class.php	(revision 7308)
@@ -1797,5 +1797,5 @@
 						
 						$id = $arReturn['checkout']['payment'];
-						$tax_keyp = $this->shop->arPayment[$id]['mwst'];
+						$tax_keyp = wpsg_getStr($this->shop->arPayment[$id]['mwst']);
 						$mb->setPaymentKosten($arReturn, $pricep, $tax_keyp);
 						$taxp = $arReturn['payment']['mwst'];
Index: /lib/wpsg_cache.class.php
===================================================================
--- /lib/wpsg_cache.class.php	(revision 7307)
+++ /lib/wpsg_cache.class.php	(revision 7308)
@@ -37,4 +37,5 @@
 			$this->_BasketArray = false;
 			$this->_arOrderObjects = array();
+			$this->_arCountry = [];
 			
 		} // public function __construct()
Index: /lib/wpsg_calculation.class.php
===================================================================
--- /lib/wpsg_calculation.class.php	(revision 7307)
+++ /lib/wpsg_calculation.class.php	(revision 7308)
@@ -487,7 +487,7 @@
 					];
 					
-					$this->arCalculation['sum'][$cr['type'].'_netto'] += $netto;
-					$this->arCalculation['sum'][$cr['type'].'_brutto'] += $brutto;
-					$this->arCalculation['sum'][$cr['type'].'_tax'] += $tax;
+					wpsg_addSet($this->arCalculation['sum'][$cr['type'].'_netto'], $netto);
+					wpsg_addSet($this->arCalculation['sum'][$cr['type'].'_brutto'],$brutto);
+					wpsg_addSet($this->arCalculation['sum'][$cr['type'].'_tax'],$tax);
 					
 					$this->arCalculation['sum']['netto'] += $netto;
@@ -1150,5 +1150,5 @@
 				$oCountry = \wpsg_country::getInstance($country_id);
 			
-				$tax_value = $this->arCountry[$country_id][$tax['key']];
+				$tax_value = (($tax['key'] === '0')?0:$this->arCountry[$country_id][$tax['key']]);
 				
 				if ($oCountry->isLoaded()) {
@@ -1189,5 +1189,5 @@
 				$this->arCalculation['tax'][$tax_key] = [
 					'key' => $tax_key,
-					'tax_value' => $this->arCountry[$arTaxKey[1]][$tax_key],
+					'tax_value' => (($tax_key !== '0')?$this->arCountry[$arTaxKey[1]][$tax_key]:0),
 					'netto' => 0,
 					'brutto' => 0
Index: /mods/wpsg_mod_abo.class.php
===================================================================
--- /mods/wpsg_mod_abo.class.php	(revision 7307)
+++ /mods/wpsg_mod_abo.class.php	(revision 7308)
@@ -871,5 +871,5 @@
 		{
 
-			if (substr($p['id'], 0, 3) == 'abo')
+			if (substr(wpsg_getStr($p['product_key']), 0, 3) == 'abo')
 			{
 
Index: /mods/wpsg_mod_coverletter.class.php
===================================================================
--- /mods/wpsg_mod_coverletter.class.php	(revision 7307)
+++ /mods/wpsg_mod_coverletter.class.php	(revision 7308)
@@ -209,5 +209,5 @@
 						'/%shopinfo_zip%/i' => $this->shop->get_option('wpsg_shopdata_2_zip'),
 						'/%shopinfo_city%/i' => $this->shop->get_option('wpsg_shopdata_2_city'),
-						'/%shopinfo_country%/i' => $this->shop->get_option('wpsg_shopdata_2_country'),
+						'/%shopinfo_country%/i' => "==".$this->shop->get_option('wpsg_shopdata_2_country'),
 						'/%shopinfo_tel%/i' => $this->shop->get_option('wpsg_shopdata_2_tel'),
 						'/%shopinfo_fax%/i' => $this->shop->get_option('wpsg_shopdata_2_fax'),
@@ -223,5 +223,4 @@
 					true,
 					true,
-					__('Vorschau', 'wpsg'),
 					'coverletter-preview.pdf',
 					$arCustomReplace