Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java,v
diff -u -r1.15 -r1.16
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java	21 May 2015 23:49:01 -0000	1.15
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java	24 Jul 2015 08:04:38 -0000	1.16
@@ -374,15 +374,15 @@
 	    ImageGalleryItem delAtt = (ImageGalleryItem) iter.next();
 	    iter.remove();
 	}
+	
+	// **********************************************
+	// finally persist imageGalleryPO again
+	service.saveOrUpdateImageGallery(imageGalleryPO);
 
 	// ************************* Handle rating criterias *******************
 	List<RatingCriteria> oldCriterias = (List<RatingCriteria>) sessionMap.get(AttributeNames.ATTR_RATING_CRITERIAS);
 	service.saveRatingCriterias(request, oldCriterias, contentId);
 
-	// **********************************************
-	// finally persist imageGalleryPO again
-	service.saveOrUpdateImageGallery(imageGalleryPO);
-
 	imageGalleryForm.setImageGallery(imageGalleryPO);
 
 	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java,v
diff -u -r1.43 -r1.44
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	20 Jun 2015 20:48:46 -0000	1.43
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	24 Jul 2015 08:09:55 -0000	1.44
@@ -157,12 +157,7 @@
 		    qaContent.getQaQueContents().remove(removeableQuestion);
 		    qaService.removeQuestion(removeableQuestion);
 		}
-	    }
-	    
-	    // ************************* Handle rating criterias *******************
-	    List<RatingCriteria> oldCriterias = (List<RatingCriteria>) sessionMap
-		    .get(AttributeNames.ATTR_RATING_CRITERIAS);
-	    qaService.saveRatingCriterias(request, oldCriterias, toolContentID);
+	    }	    
 
 	    // store content
 	    SortedSet<QaCondition> conditionSet = (SortedSet<QaCondition>) sessionMap
@@ -181,6 +176,11 @@
 		qaService.saveOrUpdateQuestion(existingQaQueContent);
 		displayOrder++;
 	    }
+	    
+	    // ************************* Handle rating criterias *******************
+	    List<RatingCriteria> oldCriterias = (List<RatingCriteria>) sessionMap
+		    .get(AttributeNames.ATTR_RATING_CRITERIAS);
+	    qaService.saveRatingCriterias(request, oldCriterias, toolContentID);
 
 	    QaUtils.setFormProperties(request, qaAuthoringForm, qaGeneralAuthoringDTO, strToolContentID, httpSessionID);