Problems with the list of products in parent category.

Index: listing_div.php
===================================================================
--- listing_div.php	(revision 12671)
+++ listing_div.php	(revision 12796)
@@ -8,7 +8,7 @@
 }
 
 $mainDivName = $this->params->get('main_div_name', '');
-$enableCarousel = (int)$this->params->get('enable_carousel', 0);
+$enableCarousel = (int)$this->params->get('enable_carousel', 0) && $this->module;
 $infinite_scroll = !$enableCarousel && ((int)$this->params->get('infinite_scroll', 0) == 1) && ((int)$this->params->get('random', 0) == 0);
 
 $this->align = (((int)$this->params->get('text_center') == 0) ? 'left' : 'center');
@@ -50,9 +50,9 @@
 if(in_array($pagination, array('top', 'both')) && $this->params->get('show_limit') && $this->pageInfo->elements->total && !$infinite_scroll) {
 	$this->pagination->form = '_top';
 ?>
-<form action="<?php echo hikashop_currentURL(); ?>" method="post" name="adminForm_<?php echo $mainDivName . $this->category_selected; ?>_top">
+<form action="<?php echo str_replace('&tmpl=raw', '', hikashop_currentURL()); ?>" method="post" name="adminForm_<?php echo $mainDivName . $this->category_selected; ?>_top">
 	<div class="hikashop_products_pagination hikashop_products_pagination_top">
-		<?php echo $this->pagination->getListFooter($this->params->get('limit')); ?>
+		<?php echo str_replace('&tmpl=raw','', $this->pagination->getListFooter($this->params->get('limit'))); ?>
 		<span class="hikashop_results_counter"><?php echo $this->pagination->getResultsCounter(); ?></span>
 	</div>
 	<input type="hidden" name="filter_order_<?php echo $mainDivName . $this->category_selected; ?>" value="<?php echo $this->pageInfo->filter->order->value; ?>" />
@@ -115,10 +115,10 @@
 		else
 			echo '<div class="hk-row-fluid hk-row-'.$row_fluid.'">';
 
-		$itemLayoutType = $this->params->get('div_item_layout_type');	
-		
+		$itemLayoutType = $this->params->get('div_item_layout_type');
+
 		foreach($this->rows as $row) {
-?>		
+?>
 		<div class="hkc-md-<?php echo (int)$span; ?> hikashop_product hikashop_product_column_<?php echo $current_column; ?> hikashop_product_row_<?php echo $current_row; ?>"
 			itemprop="itemList" itemscope="" itemtype="http://schema.org/ItemList">
 			<div class="hikashop_container">
@@ -130,10 +130,10 @@
 			$this->setLayout('listing_' . $itemLayoutType);
 			echo $this->loadTemplate();
 			unset($this->row);
-?>				
+?>
 				</div>
 			</div>
-		</div>	
+		</div>
 <?php
 			if($current_column >= $columns) {
 				$current_row++;
@@ -178,6 +178,10 @@
 				$filters_params .= '&'.$name . '=' . $value;
 			}
 		}
+		$cid = '';
+		if($this->categoryFromURL)
+			$cid = '&cid='.(int)(is_array($this->pageInfo->filter->cid) ? reset($this->pageInfo->filter->cid) : $this->pageInfo->filter->cid);
+
 ?>
 		<div class="hikashop_infinite_scroll" id="<?php echo $mainDivName; ?>_infinite_scroll">
 			<a href="#" onclick="return window.localPage.infiniteScroll('<?php echo $mainDivName; ?>');">
@@ -203,7 +207,7 @@
 	container.loading = true;
 	o.addClass(container, 'loading');
 
-	var url = '<?php echo HIKASHOP_LIVE; ?>index.php?option=com_hikashop&ctrl=product&task=listing&cid=<?php echo (int)(is_array($this->pageInfo->filter->cid) ? reset($this->pageInfo->filter->cid) : $this->pageInfo->filter->cid); ?>&limitstart=HIKAPAGE<?php echo $filters_params; ?>&Itemid=<?php echo (int)$Itemid; ?>&tmpl=raw';
+	var url = '<?php echo HIKASHOP_LIVE; ?>index.php?option=com_hikashop&ctrl=product&task=listing<?php echo $cid; ?>&limitstart=HIKAPAGE<?php echo $filters_params; ?>&Itemid=<?php echo (int)$Itemid; ?>&tmpl=raw';
 	url = url.replace(/HIKAPAGE/g, <?php echo (int)$this->pageInfo->limit->value; ?> * window.localPage.infiniteScrollPage);
 	o.xRequest(url, null, function(xhr) {
 		if(xhr.responseText.length == 0) {
@@ -303,9 +307,9 @@
 if(in_array($pagination, array('bottom', 'both')) && $this->params->get('show_limit') && $this->pageInfo->elements->total && !$infinite_scroll) {
 	$this->pagination->form = '_bottom';
 ?>
-<form action="<?php echo hikashop_currentURL(); ?>" method="post" name="adminForm_<?php echo $mainDivName . $this->category_selected; ?>_bottom">
+<form action="<?php echo str_replace('&tmpl=raw', '', hikashop_currentURL()); ?>" method="post" name="adminForm_<?php echo $mainDivName . $this->category_selected; ?>_bottom">
 	<div class="hikashop_products_pagination hikashop_products_pagination_bottom">
-		<?php echo $this->pagination->getListFooter($this->params->get('limit')); ?>
+		<?php echo str_replace('&tmpl=raw','', $this->pagination->getListFooter($this->params->get('limit'))); ?>
 		<span class="hikashop_results_counter"><?php echo $this->pagination->getResultsCounter(); ?></span>
 	</div>
 	<input type="hidden" name="filter_order_<?php echo $mainDivName . $this->category_selected; ?>" value="<?php echo $this->pageInfo->filter->order->value; ?>" />