Index: lams_common/src/java/org/lamsfoundation/lams/rating/dto/StyledCriteriaRatingDTO.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r368e89de24de1175cd9fa7cb6298d66f92948059
--- lams_common/src/java/org/lamsfoundation/lams/rating/dto/StyledCriteriaRatingDTO.java	(.../StyledCriteriaRatingDTO.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_common/src/java/org/lamsfoundation/lams/rating/dto/StyledCriteriaRatingDTO.java	(.../StyledCriteriaRatingDTO.java)	(revision 368e89de24de1175cd9fa7cb6298d66f92948059)
@@ -37,13 +37,16 @@
 
      //common properties
     private RatingCriteria ratingCriteria;
-
+    
     // all the ratings done by the current user, for a set of items ids.
     private List<StyledRatingDTO> ratingDtos;
 
     private String justificationComment;
     private Integer countRatedItems;
     
+    // ratings which are in the same group
+    private List<StyledCriteriaRatingDTO> criteriaGroup;
+    
     public StyledCriteriaRatingDTO() {
     }
 
@@ -79,6 +82,11 @@
         this.countRatedItems = countRatedItems;
     }
 
+    public List<StyledCriteriaRatingDTO> getCriteriaGroup() {
+        return criteriaGroup;
+    }
 
-
-}
+    public void setCriteriaGroup(List<StyledCriteriaRatingDTO> criteriaGroup) {
+        this.criteriaGroup = criteriaGroup;
+    }
+}
\ No newline at end of file
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/LearningController.java
===================================================================
diff -u -rec21ca839bfcba1bb6d6b45276c39a0cc3cb2f3d -r368e89de24de1175cd9fa7cb6298d66f92948059
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/LearningController.java	(.../LearningController.java)	(revision ec21ca839bfcba1bb6d6b45276c39a0cc3cb2f3d)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/LearningController.java	(.../LearningController.java)	(revision 368e89de24de1175cd9fa7cb6298d66f92948059)
@@ -536,20 +536,20 @@
 	    List<RatingCriteria> criterias = service.getRatingCriterias(peerreview.getContentId());
 
 	    Integer groupId = criteria.getRatingCriteriaGroupId();
-	    List<StyledCriteriaRatingDTO> dtos = new LinkedList<>();
+	    List<StyledCriteriaRatingDTO> criteriaGroup = new LinkedList<>();
 	    for (RatingCriteria criteriaInGroup : criterias) {
 		if (!groupId.equals(criteriaInGroup.getRatingCriteriaGroupId())) {
 		    continue;
 		}
 		StyledCriteriaRatingDTO dto = service.getUsersRatingsCommentsByCriteriaIdDTO(toolContentId,
 			toolSessionId, criteriaInGroup, userId, false, PeerreviewConstants.SORT_BY_USERNAME_ASC, null,
 			peerreview.isSelfReview(), true);
-		if (criteriaDto == null) {
-		    criteriaDto = dto;
-		}
-		dtos.add(dto);
+		criteriaGroup.add(dto);
 	    }
-	    request.setAttribute("criteriaGroup", dtos);
+	    
+	    criteriaDto = criteriaGroup.get(0);
+	    criteriaDto.setCriteriaGroup(criteriaGroup);
+
 	} else {
 	    criteriaDto = service.getUsersRatingsCommentsByCriteriaIdDTO(toolContentId, toolSessionId, criteria, userId,
 		    (criteria.isCommentRating() || criteria.isStarStyleRating()),
Index: lams_tool_preview/web/pages/learning/rubrics.jsp
===================================================================
diff -u -rec21ca839bfcba1bb6d6b45276c39a0cc3cb2f3d -r368e89de24de1175cd9fa7cb6298d66f92948059
--- lams_tool_preview/web/pages/learning/rubrics.jsp	(.../rubrics.jsp)	(revision ec21ca839bfcba1bb6d6b45276c39a0cc3cb2f3d)
+++ lams_tool_preview/web/pages/learning/rubrics.jsp	(.../rubrics.jsp)	(revision 368e89de24de1175cd9fa7cb6298d66f92948059)
@@ -55,8 +55,7 @@
 
 <div id="rubrics-user-panels" class="panel-group" role="tablist" aria-multiselectable="true">
 	<%-- It is sufficient to take user names and columns from the first row/criterion --%>
-	<c:set var="exampleCriteria" value="${criteriaGroup[0]}" />
-	<c:set var="exampleRatings" value="${exampleCriteria.ratingDtos}" />
+	<c:set var="exampleRatings" value="${criteriaRatings.ratingDtos}" />
 
 	<c:forEach var="ratingDto" items="${exampleRatings}" varStatus="learnerOrderId">
 			
@@ -75,14 +74,14 @@
 					<table class="table table-hover table-bordered rubrics-table">
 						<tr>
 							<%-- Each answer column has the same length, all remaining space is take by the question column --%>
-							<th class="col-xs-${12 - fn:length(exampleCriteria.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
-							<c:forEach var="columnHeader" items="${exampleCriteria.ratingCriteria.rubricsColumnHeaders}">
+							<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+							<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}">
 								<th class="col-xs-2">
 									<c:out value="${columnHeader}" escapeXml="false"/>
 								</th>
 							</c:forEach>
 						</tr>
-						<c:forEach var="criteriaDto" items="${criteriaGroup}">
+						<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 							<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
 							<tr>
 								<td>