diff --git a/module/index/js/index.js b/module/index/js/index.js
index 1874d9f87c..122cc7eff1 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -94,11 +94,6 @@
                 return link.prj ? 'project' : 'report';
             }
         }
-        if(moduleName === 'program')
-        {
-            if(methodLowerCase.indexOf('pgm') === 0) return 'program';
-            if(methodLowerCase === 'index' || methodLowerCase.indexOf('prj') === 0) return 'project';
-        }
         if(moduleName === 'story' && methodLowerCase === 'zerocase')
         {
             return link.params.from == 'project' ? 'project' : 'qa';
diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php
index 6101dcfcb8..470e165db5 100644
--- a/module/program/view/browsebylist.html.php
+++ b/module/program/view/browsebylist.html.php
@@ -49,7 +49,7 @@
           <?php if($program->type == 'program'):?>
           <?php echo html::a($this->createLink('program', 'product', "programID=$program->id"), $program->name);?>
           <?php else:?>
-          <?php echo html::a($this->createLink('program', 'index', "programID=$program->id", '', '', $program->id), $program->name);?>
+          <?php echo html::a($this->createLink('project', 'index', "projectID=$program->id", '', '', $program->id), $program->name);?>
           <?php endif;?>
         </td>
         <td>
diff --git a/module/project/control.php b/module/project/control.php
index 0bd75d88e2..b00083a575 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -168,7 +168,7 @@ class project extends control
     public function index($projectID = 0)
     {
         $this->lang->navGroup->project = 'project';
-        $projectID = $this->project->saveState($projectID, $this->project->getPairs());
+        $projectID = $this->project->saveState($projectID, $this->project->getPairsByProgram());
 
         $project = $this->project->getByID($projectID);
         if(empty($project) || $project->type != 'project') die(js::error($this->lang->notFound) . js::locate('back'));