diff --git a/main/survey/survey.lib.php b/main/survey/survey.lib.php
index 6c0b108364..4e21045867 100644
--- a/main/survey/survey.lib.php
+++ b/main/survey/survey.lib.php
@@ -917,7 +917,7 @@ class question
 	function create_form($form_content)
 	{
 		global $fck_attribute;
-		$this->html = '<form id="question_form" name="question_form" method="post" action="'.$_SERVER['PHP_SELF'].'?action='.$_GET['action'].'&type='.$_GET['type'].'&survey_id='.$_GET['survey_id'].'&question_id='.$_GET['question_id'].'">';
+		$this->html = '<form id="question_form" name="question_form" method="post" action="'.api_get_self().'?action='.$_GET['action'].'&type='.$_GET['type'].'&survey_id='.$_GET['survey_id'].'&question_id='.$_GET['question_id'].'">';
 		$this->html .= '		<input type="hidden" name="survey_id" id="survey_id" value="'.$_GET['survey_id'].'"/>';
 		$this->html .= '		<input type="hidden" name="question_id" id="question_id" value="'.$_GET['question_id'].'"/>';
 		$this->html .= '		<input type="hidden" name="shared_question_id" id="shared_question_id" value="'.$form_content['shared_question_id'].'"/>';
@@ -932,7 +932,7 @@ class question
 		$fck_attribute['Height'] = '100';
 		$fck_attribute['ToolbarSet'] = 'Survey';
 		//$this->html .= '		<td><input type="text" name="question" id="question" value="'.$form_content['question'].'"/></td>';
-		$this->html .= '		<td colspan="3" width="500">'.api_return_html_area('question', $form_content['question']).'</td>';
+		$this->html .= '		<td colspan="3" width="500">'.api_return_html_area('question', stripslashes($form_content['question'])).'</td>';
 		$this->html .= '	</tr>';
 		/*
 		$this->html .= '	<tr>';
@@ -1329,7 +1329,7 @@ class multipleresponse extends question
 			$this->html .= '	<tr>';
 			$this->html .= '		<td align="right"><label for="answers['.$key.']">'.($key+1).'</label></td>';
 			//$this->html .= '		<td><input type="text" name="answers['.$key.']" id="answers['.$key.']" value="'.$form_content['answers'][$key].'" /></td>';
-			$this->html .= '		<td width="500">'.api_return_html_area('answers['.$key.']', $form_content['answers'][$key]).'</td>';
+			$this->html .= '		<td width="500">'.api_return_html_area('answers['.$key.']', stripslashes($form_content['answers'][$key])).'</td>';
 			$this->html .= '		<td>';
 			if ($key<$total_number_of_answers-1)
 			{
diff --git a/main/survey/survey_list.php b/main/survey/survey_list.php
index 989a3b5a71..2cc83b2102 100644
--- a/main/survey/survey_list.php
+++ b/main/survey/survey_list.php
@@ -21,7 +21,7 @@
 *	@package dokeos.survey
 * 	@author unknown, the initial survey that did not make it in 1.8 because of bad code
 * 	@author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts of the code
-* 	@version $Id: survey_list.php 11685 2007-03-25 21:14:55Z pcool $
+* 	@version $Id: survey_list.php 11799 2007-03-30 09:31:17Z elixir_julian $
 *
 * 	@todo The invite column is not done
 * 	@todo try to understand the white, blue, ... template stuff.
@@ -124,7 +124,7 @@ if ($_POST['action'])
 // Action links
 echo '<a href="create_new_survey.php?action=add">'.get_lang('CreateNewSurvey').'</a> | ';
 //echo '<a href="survey_all_courses.php">'.get_lang('CreateExistingSurvey').'</a> | ';
-echo '<a href="'.$_SERVER['PHP_SELF'].'?search=advanced">'.get_lang('Search').'</a>';
+echo '<a href="'.api_get_self().'?search=advanced">'.get_lang('Search').'</a>';
 
 // Main content
 display_survey_list();
@@ -190,7 +190,7 @@ function display_survey_list()
 	if ($_GET['do_search'])
 	{
 		$message = get_lang('DisplaySearchResults').'<br />';
-		$message .= '<a href="'.$_SERVER['PHP_SELF'].'">'.get_lang('DisplayAll').'</a>';
+		$message .= '<a href="'.api_get_self().'">'.get_lang('DisplayAll').'</a>';
 		Display::display_normal_message($message, false);
 	}