diff --git a/main/gradebook/gradebook_add_link.php b/main/gradebook/gradebook_add_link.php
index 23d531cdcd..2faa2752b5 100644
--- a/main/gradebook/gradebook_add_link.php
+++ b/main/gradebook/gradebook_add_link.php
@@ -41,9 +41,12 @@ if ($typeform->validate() && isset($_GET['newtypeselected'])) {
 if (isset($_GET['typeselected']) && $_GET['typeselected'] != '0') {
 	$url = api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat']).'&typeselected=' . Security::remove_XSS($_GET['typeselected']) . '&course_code=' . Security::remove_XSS($_GET['course_code']);
 	$addform = new LinkAddEditForm(LinkAddEditForm :: TYPE_ADD, $all_categories, intval($_GET['typeselected']),null, 'add_link', $url);
+    
 	if ($addform->validate()) {
 		$addvalues = $addform->exportValues();
+        
 		$link= LinkFactory :: create($_GET['typeselected']);
+        
 		$link->set_user_id(api_get_user_id());
 		/*
 		if ($category[0]->get_course_code() == '' && !empty($_GET['course_code'])) {
@@ -74,7 +77,7 @@ if (isset($_GET['typeselected']) && $_GET['typeselected'] != '0') {
 		//update view_properties		
 		if (isset($_GET['typeselected']) && 5 == $_GET['typeselected'] && (isset($addvalues['select_link']) && $addvalues['select_link']<>"")) {
 
-			$sql1 = 'SELECT thread_title from '.$tbl_forum_thread.' 
+			echo $sql1 = 'SELECT thread_title from '.$tbl_forum_thread.' 
 					 WHERE c_id = '.$course_info['real_id'].' AND thread_id='.$addvalues['select_link'];
 			$res1	= Database::query($sql1);
 			$rowtit	= Database::fetch_row($res1);
@@ -89,6 +92,7 @@ if (isset($_GET['typeselected']) && $_GET['typeselected'] != '0') {
 				Database::query($sql);
 			}
 		}
+        
 		$link->add();
 				
 		$addvalue_result=!empty($addvalues['addresult'])?$addvalues['addresult']:array();
@@ -109,8 +113,7 @@ $this_section = SECTION_COURSES;
 $htmlHeadXtra[] = '<script type="text/javascript">
 $(document).ready( function() {
 
-    $("#hide_category_id").change(function(){
-        
+    $("#hide_category_id").change(function() {        
        $("#hide_category_id option:selected").each(function () {
            var cat_id = $(this).val();
             $.ajax({ 
diff --git a/main/gradebook/lib/be/exerciselink.class.php b/main/gradebook/lib/be/exerciselink.class.php
index 695f6b45a5..8fa0022554 100644
--- a/main/gradebook/lib/be/exerciselink.class.php
+++ b/main/gradebook/lib/be/exerciselink.class.php
@@ -62,8 +62,18 @@ class ExerciseLink extends AbstractLink
     	if (empty($this->course_code)) {
     		die('Error in get_not_created_links() : course code not set');
     	}    	    	
+        /*$session_id = api_get_session_id();
+        if (empty($session_id)) {
+            $session_condition = api_get_session_condition(0, true);
+        } else {
+            $session_condition = api_get_session_condition($session_id, true, true);
+        }        
 		$sql = 'SELECT id,title from '.$this->get_exercise_table().' 
+				WHERE c_id = '.$this->course_id.' AND active=1  '.$session_condition;        
+        */
+        $sql = 'SELECT id,title from '.$this->get_exercise_table().' 
 				WHERE c_id = '.$this->course_id.' AND active=1 AND session_id='.api_get_session_id().'';
+		
 		$result = Database::query($sql);
 		$cats=array();
 		while ($data=Database::fetch_array($result)) {
diff --git a/main/gradebook/lib/fe/linkform.class.php b/main/gradebook/lib/fe/linkform.class.php
index 05c06ffc68..6504e78b85 100644
--- a/main/gradebook/lib/fe/linkform.class.php
+++ b/main/gradebook/lib/fe/linkform.class.php
@@ -20,7 +20,6 @@ require_once api_get_path(LIBRARY_PATH) . 'groupmanager.lib.php';
  */
 class LinkForm extends FormValidator
 {
-
 	const TYPE_CREATE = 1;
 	const TYPE_MOVE = 2;
 
@@ -72,7 +71,7 @@ class LinkForm extends FormValidator
 	}
 
 	protected function build_create() {
-		$this->addElement('header', '', get_lang('MakeLink'));
+		$this->addElement('header', get_lang('MakeLink'));
 		$select = $this->addElement('select', 'select_link', get_lang('ChooseLink'), null, array('onchange' => 'document.create_link.submit()'));
 
 		$linktypes = LinkFactory :: get_all_types();
@@ -80,16 +79,16 @@ class LinkForm extends FormValidator
 		$select->addoption('['.get_lang('ChooseLink').']', 0);
 
 		$cc = $this->category_object->get_course_code();
+                
 		foreach ($linktypes as $linktype) {
 			$link = LinkFactory :: create ($linktype);
-			if(!empty($cc)) {
+			if (!empty($cc)) {
 				$link->set_course_code($cc);
 			} elseif(!empty($_GET['course_code'])) {
 				$link->set_course_code(Database::escape_string($_GET['course_code']));
-			}
-			
+			}			
 			// disable this element if the link works with a dropdownlist
-			// and if there are no links left
+			// and if there are no links left            
 			if (!$link->needs_name_and_description() && count($link->get_all_links()) == '0') {
 				$select->addoption($link->get_type_name(), $linktype, 'disabled');
 			} else {