diff --git a/main/inc/lib/add_course.lib.inc.php b/main/inc/lib/add_course.lib.inc.php
index b38f87ab23..7b70c013c9 100644
--- a/main/inc/lib/add_course.lib.inc.php
+++ b/main/inc/lib/add_course.lib.inc.php
@@ -1219,8 +1219,8 @@ function update_Db_course($courseDbName)
 	$sql = "CREATE TABLE `".$TABLESURVEY."` (
 			  survey_id int unsigned NOT NULL auto_increment,
 			  code varchar(20) default NULL,
-			  title varchar(80) default NULL,
-			  subtitle varchar(80) default NULL,
+			  title text default NULL,
+			  subtitle text default NULL,
 			  author varchar(20) default NULL,
 			  lang varchar(20) default NULL,
 			  avail_from date default NULL,
diff --git a/main/install/dokeos_main.sql b/main/install/dokeos_main.sql
index f3fb1b3314..5b2a4bb150 100644
--- a/main/install/dokeos_main.sql
+++ b/main/install/dokeos_main.sql
@@ -679,9 +679,9 @@ UNLOCK TABLES;
 CREATE TABLE `shared_survey` (
   `survey_id` int(10) unsigned NOT NULL auto_increment,
   `code` varchar(20) default NULL,
-  `title` varchar(80) default NULL,
-  `subtitle` varchar(80) default NULL,
-  `author` varchar(20) default NULL,
+  `title` text default NULL,
+  `subtitle` text default NULL,
+  `author` varchar(250) default NULL,
   `lang` varchar(20) default NULL,
   `template` varchar(20) default NULL,
   `intro` text,
@@ -707,6 +707,7 @@ CREATE TABLE `shared_survey_question` (
   `display` varchar(10) NOT NULL default '',
   `sort` int(11) NOT NULL default '0',
   `code` varchar(40) NOT NULL default '',
+  `max_value` int(11) NOT NULL default '',
   PRIMARY KEY  (`question_id`)
 );
 
diff --git a/main/survey/survey.lib.php b/main/survey/survey.lib.php
index 13702071b2..6c0b108364 100644
--- a/main/survey/survey.lib.php
+++ b/main/survey/survey.lib.php
@@ -670,6 +670,7 @@ class survey_manager
 	{
 		// table definitions
 		$table_survey_question 	= Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION);
+		$table_survey_question_option 	= Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION_OPTION);
 
 		// first we have to get the shared_question_id
 		$question_data = survey_manager::get_question($question_id);
@@ -678,8 +679,9 @@ class survey_manager
 		$sql = "DELETE FROM $table_survey_question WHERE question_id='".Database::escape_string($question_data['shared_question_id'])."'";
 		$res = api_sql_query($sql, __FILE__, __LINE__);
 
-		// deleting the options of the question of the survey
-		// survey_manager::delete_shared_survey_question_option($survey_id, $question_id, $shared);
+		// deleting the options of the question of the survey question
+		$sql = "DELETE FROM $table_survey_question_option WHERE question_id='".Database::escape_string($question_data['shared_question_id'])."'";
+		$res = api_sql_query($sql, __FILE__, __LINE__);
 	}
 
 	/******************************************************************************************************