diff --git a/addons/survey/data/survey.user_input.csv b/addons/survey/data/survey.user_input.csv
index e6ee973035f..7af2096bb88 100644
--- a/addons/survey/data/survey.user_input.csv
+++ b/addons/survey/data/survey.user_input.csv
@@ -4,3 +4,4 @@ ui2,feedback_form,done
ui3,feedback_form,done
ui4,feedback_form,skip
ui5,feedback_form,skip
+ui6,feedback_form,new
diff --git a/addons/survey/data/survey.user_input_line.csv b/addons/survey/data/survey.user_input_line.csv
index 7900ca34c0b..58b67969d5a 100644
--- a/addons/survey/data/survey.user_input_line.csv
+++ b/addons/survey/data/survey.user_input_line.csv
@@ -1 +1,125 @@
-id,user_input_id:id,question_id:id,skipped,answer_type,value_text,value_number,value_date,value_free_text,value_suggested,value_suggested_row
+id,user_input_id:id,question_id:id,skipped,answer_type,value_text,value_number,value_date,value_free_text,value_suggested:id,value_suggested_row:id
+uil_1,ui1,feedback_1_1,,suggestion,,,,,choice_1_1_1,
+uil_2,ui1,feedback_1_2,,suggestion,,,,,choice_1_2_2,
+uil_3,ui1,feedback_2_1,,suggestion,,,,,fcol_2_1_2,frow_2_1_1
+uil_4,ui1,feedback_2_1,,suggestion,,,,,fcol_2_1_3,frow_2_1_2
+uil_5,ui1,feedback_2_1,,suggestion,,,,,fcol_2_1_4,frow_2_1_3
+uil_6,ui1,feedback_2_1,,suggestion,,,,,fcol_2_1_1,frow_2_1_4
+uil_7,ui1,feedback_2_1,,suggestion,,,,,fcol_2_1_2,frow_2_1_5
+uil_8,ui1,feedback_2_2,,suggestion,,,,,fcol_2_2_4,frow_2_2_1
+uil_9,ui1,feedback_2_2,,suggestion,,,,,fcol_2_2_1,frow_2_2_2
+uil_10,ui1,feedback_2_2,,suggestion,,,,,fcol_2_2_2,frow_2_2_3
+uil_11,ui1,feedback_2_2,,suggestion,,,,,fcol_2_2_3,frow_2_2_4
+uil_12,ui1,feedback_2_2,,suggestion,,,,,fcol_2_2_4,frow_2_2_5
+uil_13,ui1,feedback_2_3,,free_text,,,,It is very difficult to understand,,
+uil_14,ui1,feedback_2_4,,suggestion,,,,,choice_2_4_1,
+uil_15,ui1,feedback_2_4,,suggestion,,,,,choice_2_4_2,
+uil_16,ui1,feedback_2_5,,suggestion,,,,,fcol_2_5_3,frow_2_5_1
+uil_17,ui1,feedback_2_5,,suggestion,,,,,fcol_2_5_4,frow_2_5_2
+uil_18,ui1,feedback_2_5,,suggestion,,,,,fcol_2_5_1,frow_2_5_3
+uil_19,ui1,feedback_2_5,,suggestion,,,,,fcol_2_5_2,frow_2_5_4
+uil_20,ui1,feedback_2_5,,suggestion,,,,,fcol_2_5_3,frow_2_5_5
+uil_21,ui1,feedback_2_6,,suggestion,,,,,choice_2_6_2,
+uil_22,ui1,feedback_2_7,,suggestion,,,,,fcol_2_7_2,frow_2_7_1
+uil_23,ui1,feedback_2_7,,suggestion,,,,,fcol_2_7_3,frow_2_7_2
+uil_24,ui1,feedback_2_7,,suggestion,,,,,fcol_2_7_4,frow_2_7_3
+uil_25,ui1,feedback_2_7,,suggestion,,,,,fcol_2_7_1,frow_2_7_4
+uil_26,ui1,feedback_3_1,,suggestion,,,,,choice_3_1_1,
+uil_27,ui1,feedback_3_1,,suggestion,,,,,choice_3_1_5,
+uil_28,ui1,feedback_3_2,,free_text,,,,Accept merge proposals more quickly,,
+uil_29,ui1,feedback_3_3,,free_text,,,,Pay them!,,
+uil_30,ui1,feedback_4_1,,suggestion,,,,,choice_4_1_2,
+uil_31,ui1,feedback_4_1,,suggestion,,,,,choice_4_1_3,
+uil_32,ui1,feedback_4_1,,suggestion,,,,,choice_4_1_4,
+uil_33,ui2,feedback_1_1,,suggestion,,,,,choice_1_1_3,
+uil_34,ui2,feedback_1_2,,suggestion,,,,,choice_1_2_3,
+uil_35,ui2,feedback_2_1,,suggestion,,,,,fcol_2_1_3,frow_2_1_1
+uil_36,ui2,feedback_2_1,,suggestion,,,,,fcol_2_1_4,frow_2_1_2
+uil_37,ui2,feedback_2_1,,suggestion,,,,,fcol_2_1_1,frow_2_1_3
+uil_38,ui2,feedback_2_1,,suggestion,,,,,fcol_2_1_2,frow_2_1_4
+uil_39,ui2,feedback_2_1,,suggestion,,,,,fcol_2_1_3,frow_2_1_5
+uil_40,ui2,feedback_2_2,,suggestion,,,,,fcol_2_2_3,frow_2_2_1
+uil_41,ui2,feedback_2_2,,suggestion,,,,,fcol_2_2_4,frow_2_2_2
+uil_42,ui2,feedback_2_2,,suggestion,,,,,fcol_2_2_1,frow_2_2_3
+uil_43,ui2,feedback_2_2,,suggestion,,,,,fcol_2_2_2,frow_2_2_4
+uil_44,ui2,feedback_2_2,,suggestion,,,,,fcol_2_2_3,frow_2_2_5
+uil_45,ui2,feedback_2_3,,free_text,,,,I prefer a command-line tool,,
+uil_46,ui2,feedback_2_4,,suggestion,,,,,choice_2_4_3,
+uil_47,ui2,feedback_2_4,,suggestion,,,,,choice_2_4_1,
+uil_48,ui2,feedback_2_5,,suggestion,,,,,fcol_2_5_4,frow_2_5_1
+uil_49,ui2,feedback_2_5,,suggestion,,,,,fcol_2_5_1,frow_2_5_2
+uil_50,ui2,feedback_2_5,,suggestion,,,,,fcol_2_5_2,frow_2_5_3
+uil_51,ui2,feedback_2_5,,suggestion,,,,,fcol_2_5_3,frow_2_5_4
+uil_52,ui2,feedback_2_5,,suggestion,,,,,fcol_2_5_4,frow_2_5_5
+uil_53,ui2,feedback_2_6,,suggestion,,,,,choice_2_6_1,
+uil_54,ui2,feedback_2_7,,suggestion,,,,,fcol_2_7_3,frow_2_7_1
+uil_55,ui2,feedback_2_7,,suggestion,,,,,fcol_2_7_4,frow_2_7_2
+uil_56,ui2,feedback_2_7,,suggestion,,,,,fcol_2_7_1,frow_2_7_3
+uil_57,ui2,feedback_2_7,,suggestion,,,,,fcol_2_7_2,frow_2_7_4
+uil_58,ui2,feedback_3_1,,suggestion,,,,,choice_3_1_2,
+uil_59,ui2,feedback_3_1,,suggestion,,,,,choice_3_1_3,
+uil_60,ui2,feedback_3_1,,suggestion,,,,,choice_3_1_4,
+uil_61,ui2,feedback_3_2,,free_text,,,,Reward most engaged contributors,,
+uil_62,ui2,feedback_3_3,,free_text,,,,Launch OpenERP hackhatons,,
+uil_63,ui2,feedback_4_1,,suggestion,,,,,choice_4_1_1,
+uil_64,ui2,feedback_4_1,,suggestion,,,,,choice_4_1_2,
+uil_65,ui2,feedback_4_1,,suggestion,,,,,choice_4_1_3,
+uil_66,ui3,feedback_1_1,,suggestion,,,,,choice_1_1_1,
+uil_67,ui3,feedback_1_2,,suggestion,,,,,choice_1_2_2,
+uil_68,ui3,feedback_2_1,,suggestion,,,,,fcol_2_1_2,frow_2_1_1
+uil_69,ui3,feedback_2_1,,suggestion,,,,,fcol_2_1_3,frow_2_1_2
+uil_70,ui3,feedback_2_1,,suggestion,,,,,fcol_2_1_4,frow_2_1_3
+uil_71,ui3,feedback_2_1,,suggestion,,,,,fcol_2_1_1,frow_2_1_4
+uil_72,ui3,feedback_2_1,,suggestion,,,,,fcol_2_1_2,frow_2_1_5
+uil_73,ui3,feedback_2_2,,suggestion,,,,,fcol_2_2_4,frow_2_2_1
+uil_74,ui3,feedback_2_2,,suggestion,,,,,fcol_2_2_1,frow_2_2_2
+uil_75,ui3,feedback_2_2,,suggestion,,,,,fcol_2_2_2,frow_2_2_3
+uil_76,ui3,feedback_2_2,,suggestion,,,,,fcol_2_2_3,frow_2_2_4
+uil_77,ui3,feedback_2_2,,suggestion,,,,,fcol_2_2_4,frow_2_2_5
+uil_78,ui3,feedback_2_3,,free_text,,,,I prefer a command-line tool,,
+uil_79,ui3,feedback_2_4,,suggestion,,,,,choice_2_4_1,
+uil_80,ui3,feedback_2_4,,suggestion,,,,,choice_2_4_2,
+uil_81,ui3,feedback_2_5,,suggestion,,,,,fcol_2_5_3,frow_2_5_1
+uil_82,ui3,feedback_2_5,,suggestion,,,,,fcol_2_5_4,frow_2_5_2
+uil_83,ui3,feedback_2_5,,suggestion,,,,,fcol_2_5_1,frow_2_5_3
+uil_84,ui3,feedback_2_5,,suggestion,,,,,fcol_2_5_2,frow_2_5_4
+uil_85,ui3,feedback_2_5,,suggestion,,,,,fcol_2_5_3,frow_2_5_5
+uil_86,ui3,feedback_2_6,,suggestion,,,,,choice_2_6_2,
+uil_87,ui3,feedback_2_7,,suggestion,,,,,fcol_2_7_2,frow_2_7_1
+uil_88,ui3,feedback_2_7,,suggestion,,,,,fcol_2_7_3,frow_2_7_2
+uil_89,ui3,feedback_2_7,,suggestion,,,,,fcol_2_7_4,frow_2_7_3
+uil_90,ui3,feedback_2_7,,suggestion,,,,,fcol_2_7_1,frow_2_7_4
+uil_91,ui3,feedback_3_1,,suggestion,,,,,choice_3_1_1,
+uil_92,ui3,feedback_3_1,,suggestion,,,,,choice_3_1_5,
+uil_93,ui3,feedback_3_2,,free_text,,,,Reward most engaged contributors,,
+uil_94,ui3,feedback_3_3,,free_text,,,,Launch OpenERP hackhatons,,
+uil_95,ui3,feedback_4_1,,suggestion,,,,,choice_4_1_2,
+uil_96,ui3,feedback_4_1,,suggestion,,,,,choice_4_1_3,
+uil_97,ui3,feedback_4_1,,suggestion,,,,,choice_4_1_4,
+uil_98,ui4,feedback_1_1,,suggestion,,,,,choice_1_1_2,
+uil_99,ui4,feedback_1_2,,suggestion,,,,,choice_1_2_3,
+uil_100,ui4,feedback_2_1,,suggestion,,,,,fcol_2_1_1,frow_2_1_1
+uil_101,ui4,feedback_2_1,,suggestion,,,,,fcol_2_1_2,frow_2_1_2
+uil_102,ui4,feedback_2_1,,suggestion,,,,,fcol_2_1_3,frow_2_1_3
+uil_103,ui4,feedback_2_1,,suggestion,,,,,fcol_2_1_4,frow_2_1_4
+uil_104,ui4,feedback_2_1,,suggestion,,,,,fcol_2_1_1,frow_2_1_5
+uil_105,ui4,feedback_2_2,,suggestion,,,,,fcol_2_2_4,frow_2_2_1
+uil_106,ui4,feedback_2_2,,suggestion,,,,,fcol_2_2_1,frow_2_2_2
+uil_107,ui4,feedback_2_2,,suggestion,,,,,fcol_2_2_2,frow_2_2_3
+uil_108,ui4,feedback_2_2,,suggestion,,,,,fcol_2_2_3,frow_2_2_4
+uil_109,ui4,feedback_2_2,,suggestion,,,,,fcol_2_2_4,frow_2_2_5
+uil_110,ui4,feedback_2_3,,free_text,,,,A more graphical tool would be useful.,,
+uil_111,ui4,feedback_2_4,,suggestion,,,,,choice_2_4_2,
+uil_112,ui4,feedback_2_4,,suggestion,,,,,choice_2_4_3,
+uil_113,ui4,feedback_2_5,,suggestion,,,,,fcol_2_5_3,frow_2_5_1
+uil_114,ui4,feedback_2_5,,suggestion,,,,,fcol_2_5_4,frow_2_5_2
+uil_115,ui4,feedback_2_5,,suggestion,,,,,fcol_2_5_1,frow_2_5_3
+uil_116,ui4,feedback_2_5,,suggestion,,,,,fcol_2_5_2,frow_2_5_4
+uil_117,ui4,feedback_2_5,,suggestion,,,,,fcol_2_5_3,frow_2_5_5
+uil_118,ui4,feedback_2_6,,suggestion,,,,,choice_2_6_1,
+uil_119,ui4,feedback_2_7,,suggestion,,,,,fcol_2_7_2,frow_2_7_1
+uil_120,ui4,feedback_2_7,,suggestion,,,,,fcol_2_7_3,frow_2_7_2
+uil_121,ui4,feedback_2_7,,suggestion,,,,,fcol_2_7_4,frow_2_7_3
+uil_122,ui4,feedback_2_7,,suggestion,,,,,fcol_2_7_1,frow_2_7_4
+uil_123,ui5,feedback_1_1,,suggestion,,,,,choice_1_1_1,
+uil_124,ui5,feedback_1_2,,suggestion,,,,,choice_1_2_2,
diff --git a/addons/survey/data/survey_demo_feedback.xml b/addons/survey/data/survey_demo_feedback.xml
index 314679ba30d..2979bd3f7ff 100644
--- a/addons/survey/data/survey_demo_feedback.xml
+++ b/addons/survey/data/survey_demo_feedback.xml
@@ -297,12 +297,12 @@ what have been your difficulties.</p>
1
- There is too many groups defined, security is too complex to set
+ There are too many groups defined, security is too complex to set
2
- There is too few groups defined, security isn't accurate enough
+ There are too few groups defined, security isn't accurate enough