diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAO.java
index 7c7c9eff3f60c08dab8af28f2ffc38dd261325ae..c0030f12e5656c0292eee35bda43894afac69eaa 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAO.java
@@ -739,11 +739,6 @@ final class DataDAO extends AbstractGenericEntityWithPropertiesDAO<DataPE> imple
 
         lockRelatedEntities(dataset);
         getHibernateTemplate().saveOrUpdate(dataset);
-
-        if (operationLog.isInfoEnabled())
-        {
-            operationLog.info(String.format("ADD: data set '%s'.", dataset));
-        }
     }
 
     private void lockRelatedEntities(DataPE data)
@@ -1183,12 +1178,13 @@ final class DataDAO extends AbstractGenericEntityWithPropertiesDAO<DataPE> imple
                 @Override
                 public final Object doInHibernate(final Session session)
                 {
-                    SQLQuery query =
-                            session.createSQLQuery("select data_id_child, data_id_parent from " + TableNames.DATA_SET_RELATIONSHIPS_VIEW
-                                    + " where relationship_id = :relationship and data_id_child in (:children)");
-                    query.setParameterList("children", children);
-                    query.setParameter("relationship", relationship);
-                    return query.list();
+                    InQuery<Long, Object> inQuery = new InQuery<>();
+                    Map<String, Object> fixParams = new HashMap<String, Object>();
+                    fixParams.put("relationship", relationship);
+
+                    String query = "select data_id_child, data_id_parent from " + TableNames.DATA_SET_RELATIONSHIPS_VIEW
+                            + " where relationship_id = :relationship and data_id_child in (:children)";
+                    return inQuery.withBatch(session, query, "children", new ArrayList<>(children), fixParams);
                 }
             });
 
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js
index b63aad77245d62567c268e7905c1cd68969f4f7b..5d32b92206996b4b770c5f9dbd3e9ceb50b38d68 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js
@@ -269,12 +269,17 @@ function DataSetFormController(parentController, mode, entity, dataSet, isMini,
 		mainController.serverFacade.getArchivingInfo([dataSetPermId], function(info) {
 			var containerSize = info[dataSetPermId]["container"].length;
 			if (containerSize > 1) {
-				var warning = "Unarchiving this data set leads to unarchiving of additional " 
+				var text = "Unarchiving this data set leads to unarchiving of additional " 
 					+ (containerSize - 1) + " data sets. All these data sets need " 
 					+ PrintUtil.renderNumberOfBytes(info["total size"]) + " memory.\n Do you want to unarchive this data set anyway?";
-				Util.showWarning(warning, function() {
+				var callback = function() {
 					_this.forceUnarchiving(dataSetPermId)
-				});
+				};
+				if (info["total size"] > 5 * info[dataSetPermId]["size"]) {
+					Util.showWarning(text, callback);
+				} else {
+					callback();
+				}
 			} else {
 				_this.forceUnarchiving(dataSetPermId);
 			}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
index 23a2a2381418d2b938125dcb26fff38723ed5b94..f4d5f3b1be4d07897f241163f18118904bf508e6 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
@@ -140,13 +140,13 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
 						archiveAction = function() {
 							_this.requestOrLockArchiving();
 						}
-						archiveTooltip = "Request or lock archiving";
+						archiveTooltip = "Request or disallow archiving";
 					}
 				} else if (physicalData.status == "LOCKED") {
 					archiveAction = function() {
 						_this._dataSetFormController.setArchivingLock(false);
 					}
-					archiveTooltip = "Unlock";
+					archiveTooltip = "Allow archiving";
 				} else if (physicalData.status == "ARCHIVED") {
 					archiveAction = function() {
 						_this._dataSetFormController.unarchive();
@@ -772,7 +772,7 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
 		var _this = this;
 
 		var $window = $('<form>', { 'action' : 'javascript:void(0);' });
-		$window.append($('<legend>').append("Request or lock archiving"));
+		$window.append($('<legend>').append("Request or disallow archiving"));
 		var $buttons = $('<div>', {'id' : 'rol_archving_buttons'});
 		$window.append($buttons);
 		
@@ -780,7 +780,7 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
 		$requestButton.click(function() {
 			_this.requestArchiving();
 		});
-		var $lockButton = $('<div>', {'class' : 'btn btn-default', 'text' : 'Lock archiving', 'id' : 'lock_archiving'});
+		var $lockButton = $('<div>', {'class' : 'btn btn-default', 'text' : 'Disallow archiving', 'id' : 'lock_archiving'});
 		$lockButton.click(function() {
 			_this.lockArchiving();
 		});
@@ -848,7 +848,7 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
 		    Util.unblockUI();
 		});
 
-		$window.append($('<legend>').append('Lock archiving'));
+		$window.append($('<legend>').append('Disallow archiving'));
 		$window.append($('<p>').text("Prevent your dataset from being archived."));
 
 		var $btnAccept = $('<input>', { 'type': 'submit', 'class' : 'btn btn-primary', 'value' : 'Accept' });