diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php
index 7df0f976bb..7272a200b1 100644
--- a/main/exercice/exercise.class.php
+++ b/main/exercice/exercise.class.php
@@ -2274,7 +2274,7 @@ class Exercise {
 					// for matching
 				case MATCHING :
 					if ($from_database) {
-						$sql_answer = 'SELECT id, answer FROM '.$table_ans.' WHERE question_id="'.$questionId.'" AND correct=0';
+						$sql_answer = 'SELECT id, answer FROM '.$table_ans.' WHERE c_id = '.$course_id.' AND question_id="'.$questionId.'" AND correct=0';
 						$res_answer = Database::query($sql_answer);
 						// getting the real answer
 						$real_list =array();
@@ -2282,7 +2282,7 @@ class Exercise {
 							$real_list[$real_answer['id']]= $real_answer['answer'];
 						}
 						$sql_select_answer = 'SELECT id, answer, correct, id_auto FROM '.$table_ans.'
-                                              WHERE question_id="'.$questionId.'" AND correct <> 0 ORDER BY id_auto';            
+                                              WHERE c_id = '.$course_id.' AND question_id="'.$questionId.'" AND correct <> 0 ORDER BY id_auto';            
 						$res_answers = Database::query($sql_select_answer);
 						 
 						$questionScore = 0;
diff --git a/main/exercice/multiple_answer_combination.class.php b/main/exercice/multiple_answer_combination.class.php
index 365f0d9991..376ddd2d86 100644
--- a/main/exercice/multiple_answer_combination.class.php
+++ b/main/exercice/multiple_answer_combination.class.php
@@ -134,14 +134,10 @@ class MultipleAnswerCombination extends Question {
 
 		$form -> add_multiple_required_rule ($boxes_names , get_lang('ChooseAtLeastOneCheckbox') , 'multiple_required');
 		
-		
-		$html_total_score ='<div style="margin-bottom:2px;">'.get_lang('Score').'</div>';				
-		$form -> addElement ('html', $html_total_score);
-				
+						
 		//only 1 answer the all deal ...
-		$form->addElement('text', 'weighting[1]',null, array('class' => "span1", 'value' => '10'));
-		$form -> addElement ('html', '<br />');
-		
+		$form->addElement('text', 'weighting[1]', get_lang('Score'), array('class' => "span1", 'value' => '10'));
+				
 		$navigator_info = api_get_navigator();
 		global $text, $class, $show_quiz_edition;
 		//ie6 fix
@@ -150,12 +146,12 @@ class MultipleAnswerCombination extends Question {
                 
                 $form->addElement('submit', 'lessAnswers', get_lang('LessAnswer'),'class="minus"');
                 $form->addElement('submit', 'moreAnswers', get_lang('PlusAnswer'),'class="plus"');
-                $form->addElement('submit','submitQuestion',$text, 'class="'.$class.'"');				
+                $form->addElement('submit', 'submitQuestion', $text, 'class="'.$class.'"');				
 			} else {
                 
                 $form->addElement('style_submit_button', 'lessAnswers', get_lang('LessAnswer'),'class="minus"');
                 $form->addElement('style_submit_button', 'moreAnswers', get_lang('PlusAnswer'),'class="plus"');
-                $form->addElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"');
+                $form->addElement('style_submit_button', 'submitQuestion',$text, 'class="'.$class.'"');
 				
 				// setting the save button here and not in the question class.php