diff --git a/module/product/model.php b/module/product/model.php
index 382c71737a..42fb36592a 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1368,7 +1368,7 @@ class productModel extends model
         if(empty($products)) return array();
 
         $productKeys = array_keys($products);
-        if($orderBy == 'program_asc')
+        if($orderBy == 'program_asc' and $this->config->systemMode == 'new')
         {
             $products = $this->dao->select('t1.id as id, t1.*')->from(TABLE_PRODUCT)->alias('t1')
                 ->leftJoin(TABLE_PROGRAM)->alias('t2')->on('t1.program = t2.id')
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index 79bab6c722..811ed917a8 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -69,6 +69,7 @@
           </tr>
         </thead>
         <tbody id="productTableList">
+        <?php $lineNames = array();?>
         <?php foreach($productStructure as $programID => $program):?>
         <?php
         $trAttrs  = "data-id='program.$programID' data-parent='0' data-nested='true'";
@@ -86,7 +87,8 @@
           <?php endif;?>
 
           <?php foreach($program as $lineID => $line):?>
-          <?php if(isset($line['lineName'])):?>
+          <?php if(isset($line['lineName']) and !in_array($line['lineName'], $lineNames)):?>
+          <?php $lineNames[] = $line['lineName'];?>
           <?php
           if($this->config->systemMode == 'new' and $programID)
           {