diff --git a/mod/feedback/edit_form.php b/mod/feedback/edit_form.php
index cfc001c50d3..5cf5b930bd9 100644
--- a/mod/feedback/edit_form.php
+++ b/mod/feedback/edit_form.php
@@ -34,7 +34,7 @@ class feedback_edit_add_question_form extends moodleform {
         $mform = $this->_form;
 
         //headline
-        $mform->addElement('header', 'general', get_string('add_items', 'feedback'));
+        $mform->addElement('header', 'general', get_string('content'));
         // visible elements
         $feedback_names_options = feedback_load_feedback_items_options();
 
diff --git a/mod/feedback/item/feedback_item_form_class.php b/mod/feedback/item/feedback_item_form_class.php
index 859b910e7ad..e44ec33362a 100644
--- a/mod/feedback/item/feedback_item_form_class.php
+++ b/mod/feedback/item/feedback_item_form_class.php
@@ -51,11 +51,12 @@ abstract class feedback_item_form extends moodleform {
                                 array('size'=>FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE, 'maxlength'=>255));
         } else {
             $mform->addElement('hidden', 'dependitem', 0);
-            $mform->setType('dependitem', PARAM_INT);
             $mform->addElement('hidden', 'dependvalue', '');
-            $mform->setType('dependitem', PARAM_ALPHA);
         }
 
+        $mform->setType('dependitem', PARAM_INT);
+        $mform->setType('dependvalue', PARAM_RAW);
+
         $position_select = $mform->addElement('select',
                                             'position',
                                             get_string('position', 'feedback').' ',
diff --git a/mod/feedback/item/numeric/numeric_form.php b/mod/feedback/item/numeric/numeric_form.php
index 5abbea0fae9..449d1b724af 100644
--- a/mod/feedback/item/numeric/numeric_form.php
+++ b/mod/feedback/item/numeric/numeric_form.php
@@ -44,11 +44,13 @@ class feedback_numeric_form extends feedback_item_form {
                             'rangefrom',
                             get_string('numeric_range_from', 'feedback'),
                             array('size'=>10, 'maxlength'=>10));
+        $mform->setType('rangefrom', PARAM_INT);
 
         $mform->addElement('text',
                             'rangeto',
                             get_string('numeric_range_to', 'feedback'),
                             array('size'=>10, 'maxlength'=>10));
+        $mform->setType('rangeto', PARAM_INT);
 
         parent::definition();
         $this->set_data($item);
diff --git a/mod/feedback/lang/en/feedback.php b/mod/feedback/lang/en/feedback.php
index 1c6721e8e57..92b82c4f4c7 100644
--- a/mod/feedback/lang/en/feedback.php
+++ b/mod/feedback/lang/en/feedback.php
@@ -23,7 +23,6 @@
  */
 
 $string['add_item'] = 'Add question to activity';
-$string['add_items'] = 'Add question to activity';
 $string['add_pagebreak'] = 'Add a page break';
 $string['adjustment'] = 'Adjustment';
 $string['after_submit'] = 'After submission';
diff --git a/mod/feedback/mod_form.php b/mod/feedback/mod_form.php
index 144f6a902c7..f1329c5ee94 100644
--- a/mod/feedback/mod_form.php
+++ b/mod/feedback/mod_form.php
@@ -108,9 +108,10 @@ class mod_feedback_mod_form extends moodleform_mod {
                                array('size'=>'4',
                                     'disabled'=>'disabled',
                                     'value'=>$multiple_submit_value));
+            $mform->setType('multiple_submit_static', PARAM_RAW);
 
             $mform->addElement('hidden', 'multiple_submit', '');
-            $mform->setType('', PARAM_INT);
+            $mform->setType('multiple_submit', PARAM_INT);
             $mform->addHelpButton('multiple_submit_static', 'multiplesubmit', 'feedback');
         } else {
             $mform->addElement('selectyesno',