diff --git a/module/bug/control.php b/module/bug/control.php
index df86e72fe9..1fce9d30ca 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -991,6 +991,7 @@ class bug extends control
 
             $this->post->set('fields', $fields);
             $this->post->set('rows', $bugs);
+            $this->post->set('kind', 'bug');
             $this->fetch('file', 'export2' . $this->post->fileType, $_POST);
         }
 
diff --git a/module/file/control.php b/module/file/control.php
index ff64dc843b..5464c36052 100644
--- a/module/file/control.php
+++ b/module/file/control.php
@@ -158,6 +158,33 @@ class file extends control
     {  
         $this->view->fields   = $this->post->fields;
         $this->view->rows     = $this->post->rows;
+        switch($this->post->kind)
+        {
+        case 'task':
+            foreach($this->view->rows as $row)
+            {
+                $row->name = html::a('http://' . $_SERVER['HTTP_HOST'] . $this->createLink('task', 'view', "taskID=$row->id"), $row->name); 
+            }
+            break;
+        case 'story':
+            foreach($this->view->rows as $row)
+            {
+                $row->title= html::a('http://' . $_SERVER['HTTP_HOST'] . $this->createLink('story', 'view', "storyID=$row->id"), $row->title);  
+            }
+            break;
+        case 'bug':
+            foreach($this->view->rows as $row)
+            {
+                $row->title= html::a('http://' . $_SERVER['HTTP_HOST'] . $this->createLink('bug', 'view', "bugID=$row->id"), $row->title);  
+            }
+            break;
+        case 'testcase':
+            foreach($this->view->rows as $row)
+            {
+                $row->title= html::a('http://' . $_SERVER['HTTP_HOST'] . $this->createLink('testcase', 'view', "caseID=$row->id"), $row->title);    
+            }
+            break;
+        }
         $this->view->fileName = $this->post->fileName;
         $output = $this->parse('file', 'export2Html');
 
diff --git a/module/file/view/export2html.html.php b/module/file/view/export2html.html.php
index c6d36ad2b6..3fbb16b749 100644
--- a/module/file/view/export2html.html.php
+++ b/module/file/view/export2html.html.php
@@ -22,7 +22,7 @@ table, th, td{font-size:12px; border:1px solid gray; border-collapse:collapse;}
   <tr>
   <?php
   foreach($fields as $fieldLabel)
-  {
+  {  
       echo "<th><nobr>$fieldLabel</nobr></th>\n";
   }
   ?>
diff --git a/module/story/control.php b/module/story/control.php
index adcb96827d..6425873683 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -903,6 +903,7 @@ class story extends control
 
             $this->post->set('fields', $fields);
             $this->post->set('rows', $stories);
+            $this->post->set('kind', 'story');
             $this->fetch('file', 'export2' . $this->post->fileType, $_POST);
         }
 
diff --git a/module/task/control.php b/module/task/control.php
index 69550a08c8..61091e3efa 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -813,6 +813,7 @@ class task extends control
 
             $this->post->set('fields', $fields);
             $this->post->set('rows', $tasks);
+            $this->post->set('kind', 'task');
             $this->fetch('file', 'export2' . $this->post->fileType, $_POST);
         }
 
diff --git a/module/testcase/control.php b/module/testcase/control.php
index dbe00e3e22..a0a28630c0 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -549,6 +549,7 @@ class testcase extends control
 
             $this->post->set('fields', $fields);
             $this->post->set('rows', $cases);
+            $this->post->set('kind', 'testcase');
             $this->fetch('file', 'export2' . $this->post->fileType, $_POST);
         }