Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 6222)
+++ /controller/wpsg_ShopController.class.php	(revision 6223)
@@ -159,5 +159,5 @@
 			{
 
-				if (wpsg_isSizedInt($id, $this->get_option('wpsg_page_basket')) && wpsg_isSizedString($_REQUEST['wpsg_action'], 'showProdukt')) return '';
+				if (wpsg_isSizedInt($id, $this->get_option('wpsg_page_basket')) && wpsg_isSizedString($_REQUEST['wpsg_action'], 'showProdukt') && doing_filter('the_content')) return '';
 
 			}
Index: /controller/wpsg_SystemController.class.php
===================================================================
--- /controller/wpsg_SystemController.class.php	(revision 6222)
+++ /controller/wpsg_SystemController.class.php	(revision 6223)
@@ -639,5 +639,5 @@
 			
 			if (sizeof($this->arTemplateStack) == 1 && $this->get_option('wpsg_autoraw') === '1' && !is_admin() && !$this->bShortcode) echo '[raw]';
-			
+			 
 			if (file_exists($uv_file) && $this->get_option('wpsg_ignoreuserview') != '1')
 			{
Index: /mods/wpsg_mod_productindex.class.php
===================================================================
--- /mods/wpsg_mod_productindex.class.php	(revision 6222)
+++ /mods/wpsg_mod_productindex.class.php	(revision 6223)
@@ -42,4 +42,14 @@
 			if ($index_page === '1')
 			{
+				
+				// Shop ÃŒbernehmen?
+				if (class_exists('\\sto\\frontend\\Productindex') && in_array(get_post_meta(get_the_id(), 'wpsg_mod_productindex_template', true), array('0', '1')))
+				{
+					
+					$content = \sto\frontend\Productindex::render(get_the_id());
+					
+					return -2;
+					
+				}
 				
 				$this->shop->view['arProducts'] = $this->getProducts(get_the_id()); 
Index: /mods/wpsg_mod_productview.class.php
===================================================================
--- /mods/wpsg_mod_productview.class.php	(revision 6222)
+++ /mods/wpsg_mod_productview.class.php	(revision 6223)
@@ -268,9 +268,9 @@
 			
 			$arProductviewArray = $this->getSelectedProductArray($atts);
-			
+			  
 			$this->shop->view['wpsg_mod_productview'] = wpsg_array_merge($this->shop->view['wpsg_mod_productview'], $arProductviewArray);
 			$this->shop->view['wpsg_mod_productview']['index'] = wpsg_getInt($GLOBALS['wpsg_mod_productview_index'], 1);
 			$this->shop->view['wpsg_mod_productview']['atts'] = $atts;
-			
+ 
 			$this->shop->view['wpsg_mod_productview']['pageMax'] = $arProductviewArray['page'] * $arProductviewArray['per_page'];
 			if ($this->shop->view['wpsg_mod_productview']['pageMax'] > $arProductviewArray['count']) $this->shop->view['wpsg_mod_productview']['pageMax'] = $arProductviewArray['count']; 
@@ -380,6 +380,6 @@
 			}
 			
-			$arReturn = wpsg_product::find($arFilter, false);
-			$nCount = sizeof($arReturn);
+			$arProductIDs = wpsg_product::find($arFilter, false);
+			$nCount = sizeof($arProductIDs);
 			
 			$nPage = wpsg_getInt($atts['page'], 1);			
@@ -387,5 +387,5 @@
 			$nPages = ceil($nCount / $nPerPage);
 			
-			$arReturn = wpsg_product::getInstance(array_slice($arReturn, ($nPage - 1) * $nPerPage, $nPerPage, true));
+			$arReturn = wpsg_product::getInstance(array_slice($arProductIDs, ($nPage - 1) * $nPerPage, $nPerPage, true));
 												
 			return array(
@@ -394,4 +394,5 @@
 				'pages' => $nPages, 
 				'count' => $nCount,
+				'product_ids' => $arProductIDs,
 				'products' => $arReturn,
 				'title' => wpsg_getStr($atts['title'])