diff --git a/application/controllers/admin/assessments.php b/application/controllers/admin/assessments.php
index 58597a554b5..a27876d906a 100644
--- a/application/controllers/admin/assessments.php
+++ b/application/controllers/admin/assessments.php
@@ -33,7 +33,7 @@ class Assessments extends Survey_Common_Action
     public function index($iSurveyID)
     {
         $iSurveyID = sanitize_int($iSurveyID);
-        $sAction = Yii::app()->request->getPost('action');
+        $sAction = Yii::app()->request->getParam('action');
 
         $languages = Survey::model()->findByPk($iSurveyID)->additionalLanguages;
         $surveyLanguage = Survey::model()->findByPk($iSurveyID)->language;
@@ -99,7 +99,7 @@ private function _showAssessments($iSurveyID, $action)
         $aData['headings'] = $aHeadings;
         $aData['assessments'] = $oAssessments;
         $aData['assessmentlangs'] = Yii::app()->getConfig("assessmentlangs");
-        $aData['baselang'] = $surveyLanguage;
+        $aData['baselang'] = $surveyinfo['language'];
         $aData['action'] = $action;
         $aData['gid'] = empty($_POST['gid']) ? '' : sanitize_int($_POST['gid']);
 
@@ -124,14 +124,11 @@ private function _collectGroupData($iSurveyID)
 
     private function _collectEditData(array $aData)
     {
-        $assessments = Assessment::model()->findAllByAttributes(array(
-            'id' => sanitize_int($_POST['id']),
-            'language' => App()->language
-        ));
+        $oAssessment = Assessment::model()->find("id=:id",array(':id' => App()->request->getParam('id')));
+        if(!$oAssessment)
+            throw new CHttpException(500);// 404 ?
 
-        foreach ($assessments as $assessment) {
-            $editData = $assessment->attributes;
-        }
+        $editData = $oAssessment->attributes;
         $aData['actiontitle'] = gT("Edit");
         $aData['actionvalue'] = "assessmentupdate";
         $aData['editId'] = $editData['id'];
diff --git a/application/views/admin/assessments_view.php b/application/views/admin/assessments_view.php
index c0c2d5e43b8..a5f458495fe 100644
--- a/application/views/admin/assessments_view.php
+++ b/application/views/admin/assessments_view.php
@@ -13,18 +13,20 @@
 <th><?php eT("Title");?></th><th><?php eT("Message");?></th>
 </tr></thead><tbody>
 <?php $flipflop=true;
-foreach($assessments as $assess) {
+foreach($assessments as $assess)
+{
 	$flipflop=!$flipflop;
 	if ($flipflop==true){echo "<tr class='oddrow'>\n";}
 else {echo "<tr class='evenrow'>\n";} ?>
 <td><?php echo $assess['id'];?></td>
 <td>
 <?php if (App()->user->checkAccess('assessments', ['crud' => 'update', 'entity' => 'survey', 'entity_id' => $surveyid])) { ?>
-    <?php echo CHtml::form(array("admin/assessments/sa/index/surveyid/{$surveyid}"), 'post');?>
-        <input type='image' src='<?php echo $imageurl;?>edit_16.png' alt='<?php eT("Edit");?>' />
-        <input type='hidden' name='action' value='assessmentedit' />
-        <input type='hidden' name='id' value="<?php echo $assess['id'];?>" />
-    </form>
+    <?php 
+        echo CHtml::link(
+            CHtml::image("{$imageurl}edit_16.png",gT("Edit")),
+            array("admin/assessments","sa"=>"index","surveyid"=>$surveyid,"action"=>'assessmentedit','id'=>$assess['id'])
+        );
+    ?>
 <?php } ?>
 
 <?php if (App()->user->checkAccess('assessments', ['crud' => 'delete', 'entity' => 'survey', 'entity_id' => $surveyid])) { ?>
@@ -47,13 +49,12 @@
 <td><?php echo $assess['minimum'];?></td>
 <td><?php echo $assess['maximum'];?></td>
 <td><?php 
-    $aReplacementData=array();
-    templatereplace($assess['name'],array(),$aReplacementData,'Unspecified', false ,$assess['sid']);
+    $aReplacement=array('PERC'=>gt('Score of the current group'),'TOTAL'=>gt('Total score'));
+    templatereplace($assess['name'],$aReplacement);
     echo FlattenText(LimeExpressionManager::GetLastPrettyPrintExpression(), true);
     ?></td>
 <td><?php 
-    $aReplacementData=array();
-    templatereplace($assess['message'],array(),$aReplacementData,'Unspecified', false ,$assess['sid']);
+    templatereplace($assess['message'],$aReplacement);
     echo FlattenText(LimeExpressionManager::GetLastPrettyPrintExpression(), true);
     ?></td>
 
@@ -109,8 +110,9 @@
 	    $heading=''; $message='';
 	    if ($action == "assessmentedit")
 	    {
-	    	$results = Assessment::model()->findAllByAttributes(array('id' => $_POST['id'], 'language' => $assessmentlang));
-		    foreach ($results as $row) {
+	    	$results = Assessment::model()->findAllByAttributes(array('id' => $editId, 'language' => $assessmentlang));
+		    foreach ($results as $row) 
+            {
 		        $editdata=$row->attributes;
 		    }
 		    $heading=htmlspecialchars($editdata['name'],ENT_QUOTES);