diff --git a/grade/edit/letter/edit.php b/grade/edit/letter/edit.php
index 16f33a7fd0c..89d6515cc4f 100644
--- a/grade/edit/letter/edit.php
+++ b/grade/edit/letter/edit.php
@@ -30,7 +30,8 @@ require_once('edit_form.php');
 
 $contextid = optional_param('id', SYSCONTEXTID, PARAM_INT);
 
-$PAGE->set_url('/grade/edit/letter/edit.php');
+$url = new moodle_url('/grade/edit/letter/edit.php', array('id' => $contextid));
+$PAGE->set_url($url);
 
 if (!$context = get_context_instance_by_id($contextid)) {
     print_error('invalidcourseid');
diff --git a/grade/edit/tree/index.php b/grade/edit/tree/index.php
index 9748593e53f..f6f829dcfe9 100644
--- a/grade/edit/tree/index.php
+++ b/grade/edit/tree/index.php
@@ -44,7 +44,11 @@ $category        = optional_param('category', null, PARAM_INT);
 $aggregationtype = optional_param('aggregationtype', null, PARAM_INT);
 $showadvanced    = optional_param('showadvanced', -1, PARAM_BOOL); // sticky editting mode
 
-$PAGE->set_url('/grade/edit/tree/index.php', array('id' => $courseid));
+$url = new moodle_url('/grade/edit/tree/index.php', array('id' => $courseid));
+if($showadvanced!=-1) {
+    $url->param("showadvanced",$showadvanced);
+}
+$PAGE->set_url($url);
 
 /// Make sure they can even access this course
 if (!$course = $DB->get_record('course', array('id' => $courseid))) {