diff --git a/mod/data/field/menu/field.class.php b/mod/data/field/menu/field.class.php
index 80069ac..6333155 100755
--- a/mod/data/field/menu/field.class.php
+++ b/mod/data/field/menu/field.class.php
@@ -58,10 +58,11 @@ class data_field_menu extends data_field_base {
         global $CFG, $DB, $OUTPUT;
 
         $usedoptions = array();
+        $params = array('fieldid' => $this->field->id);
         $sql = "SELECT DISTINCT content
                   FROM {data_content}
-                 WHERE fieldid=: AND content IS NOT NULL";
-        if ($used = $DB->get_records_sql($sql, array($this->field->id))) {
+                 WHERE fieldid= :fieldid AND content IS NOT NULL";
+        if ($used = $DB->get_records_sql($sql, $params)) {
             foreach ($used as $data) {
                 $value = $data->content;
                 if ($value === '') {
diff --git a/mod/data/field/radiobutton/field.class.php b/mod/data/field/radiobutton/field.class.php
index 40951d8..879018f 100755
--- a/mod/data/field/radiobutton/field.class.php
+++ b/mod/data/field/radiobutton/field.class.php
@@ -64,7 +64,7 @@ class data_field_radiobutton extends data_field_base {
 
      function display_search_field($value = '') {
         global $CFG, $DB, $OUTPUT;
-        $temp = $DB->get_records_sql_menu('SELECT id, content FROM {data_content} WHERE fieldid=? GROUP BY content ORDER BY content', array($this->field->id));
+        $temp = $DB->get_records_sql_menu('SELECT id, content FROM {data_content} WHERE fieldid=? GROUP BY content,id ORDER BY content', array($this->field->id));
         $options = array();
         if(!empty($temp)) {
             $options[''] = '';              //Make first index blank.