diff --git a/main/glossary/glossary_ajax_request.php b/main/glossary/glossary_ajax_request.php
index 566fc3debe..8d7b78532e 100644
--- a/main/glossary/glossary_ajax_request.php
+++ b/main/glossary/glossary_ajax_request.php
@@ -9,7 +9,7 @@ require_once '../glossary/glossary.class.php';
  */
 global $charset; 
 $glossary_id=Security::remove_XSS($_POST['glossary_id']);
-$glossary_description=GlossaryManager::get_glossary_term_by_glossary_id($glossary_id);
+$glossary_description_by_id=GlossaryManager::get_glossary_term_by_glossary_id($glossary_id);
 $glossary_data=GlossaryManager::get_glossary_terms();
 $my_glossary_name=Security::remove_XSS($_POST['glossary_name']);
 $my_glossary_name=api_convert_encoding($my_glossary_name,$charset,'UTF-8');
@@ -24,7 +24,7 @@ $glossary_all_data=implode('[|.|_|.|-|.|]',$glossary_all_data);
 
 //get_glossary_terms
  if (isset($_POST['glossary_id']) && $_POST['glossary_id']==strval(intval($_POST['glossary_id']))) {
-  	echo api_xml_http_response_encode($glossary_description);	
+  	echo api_xml_http_response_encode($glossary_description_by_id);	
  } elseif (isset($_POST['glossary_data']) && $_POST['glossary_data']=='true') {
    	echo api_xml_http_response_encode($glossary_all_data);	
  } elseif(isset($_POST['glossary_name'])) {
diff --git a/main/inc/lib/fckeditor/editor/plugins/glossary/fck_glossary_automatic.js b/main/inc/lib/fckeditor/editor/plugins/glossary/fck_glossary_automatic.js
index 9ded999763..8fdbd8d429 100755
--- a/main/inc/lib/fckeditor/editor/plugins/glossary/fck_glossary_automatic.js
+++ b/main/inc/lib/fckeditor/editor/plugins/glossary/fck_glossary_automatic.js
@@ -9,40 +9,46 @@ $(document).ready(function() {
         url: "../../../main/glossary/glossary_ajax_request.php",
         data: "glossary_data=true",
         success: function(datos) {
-                data_terms=datos.split("[|.|_|.|-|.|]");    
+                data_terms=datos.split("[|.|_|.|-|.|]");  
                 for(i=0;i<data_terms.length;i++) {
                     specific_terms=data_terms[i].split("__|__|");
-                    new_html=my_text.replace(specific_terms[1],"<a href=\"javascript:void(0)\" class=\"glossary-ajax\" name=\"link"+specific_terms[0]+"\" onclick=\"\">"+specific_terms[1]+"</a>");
+                   var my_specific_terms = new RegExp(specific_terms[1],"gi");
+				    new_html=my_text.replace(my_specific_terms,"<a href=\"javascript:void(0)\" class=\"glossary-ajax\" name=\"link"+specific_terms[0]+"\" onclick=\"\">"+specific_terms[1]+"</a>");
                     $("body").html(new_html);
                     my_text=$("body").html();
                 }
-                $("body .glossary-ajax").toggle(function(){
-                    random_id=Math.round(Math.random()*100);
-                    div_show_id="div_show_id"+random_id;
-                    div_content_id="div_content_id"+random_id;
-                     $(this).append("<div id="+div_show_id+" ><div id="+div_content_id+">&nbsp;</div></div>");
-                     $("div#"+div_show_id).attr("style","display:inline;float:left;position:absolute;background-color:#F5F6CE;border-bottom: 1px dashed #dddddd;border-right: 1px dashed #dddddd;border-left: 1px dashed #dddddd;border-top: 1px dashed #dddddd;color:#305582;margin-left:5px;margin-right:5px;");
-                     $("div#"+div_content_id).attr("style","background-color:#F5F6CE;color:#305582;margin-left:8px;margin-right:8px;margin-top:5px;margin-bottom:5px;");
-                        notebook_id=$(this).attr("name");
-                        data_notebook=notebook_id.split("link");
-                        my_glossary_id=data_notebook[1];
-                        $.ajax({
-                            contentType: "application/x-www-form-urlencoded",
-                            beforeSend: function(objeto) {
-                            $("div#"+div_content_id).html("<img src=\'../../../main/inc/lib/javascript/indicator.gif\' />"); },
-                            type: "POST",
-                            url: "../../../main/glossary/glossary_ajax_request.php",
-                            data: "glossary_id="+my_glossary_id,
-                            success: function(datos) {
-                                $("div#"+div_content_id).html(datos);
-                            }
-                        });         
-                },function(){
-                    var current_element,
-                    current_element=$(this);
-                    div_show_id=current_element.find("div").attr("id");
-                    $("div#"+div_show_id).remove();
-                }); } 
+                
+			  $("body .glossary-ajax").mouseover(function(){
+	            random_id=Math.round(Math.random()*100);
+	            div_show_id="div_show_id"+random_id;
+	            div_content_id="div_content_id"+random_id;
+	             $(this).append("<div id="+div_show_id+" ><div id="+div_content_id+">&nbsp;</div></div>");
+	             $("div#"+div_show_id).attr("style","display:inline;float:left;position:absolute;background-color:#F5F6CE;border-bottom: 1px dashed #dddddd;border-right: 1px dashed #dddddd;border-left: 1px dashed #dddddd;border-top: 1px dashed #dddddd;color:#305582;margin-left:5px;margin-right:5px;");
+	             $("div#"+div_content_id).attr("style","background-color:#F5F6CE;color:#305582;margin-left:8px;margin-right:8px;margin-top:5px;margin-bottom:5px;");
+	                notebook_id=$(this).attr("name");
+	                data_notebook=notebook_id.split("link");
+	                my_glossary_id=data_notebook[1];
+	                $.ajax({
+	                    contentType: "application/x-www-form-urlencoded",
+	                    beforeSend: function(objeto) {
+	                    $("div#"+div_content_id).html("<img src=\'../../../main/inc/lib/javascript/indicator.gif\' />"); },
+	                    type: "POST",
+	                    url: "../../../main/glossary/glossary_ajax_request.php",
+	                    data: "glossary_id="+my_glossary_id,
+	                    success: function(datos) {
+	                        $("div#"+div_content_id).html(datos);
+	                    }
+	                });  
+	          });
+	          $("body .glossary-ajax").mouseout(function(){
+		            var current_element,
+		            current_element=$(this);
+		            div_show_id=current_element.find("div").attr("id");
+		            $("div#"+div_show_id).remove();   
+	          });
+
+
+				} 
                 
             });  
         });