diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/ResetArchivePendingTask.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/ResetArchivePendingTask.java
index 08a5f47e778ac0bc097b9880577235045d5873a9..1b0d7bd0fc04de342c1943981471e9fd40645582 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/ResetArchivePendingTask.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/ResetArchivePendingTask.java
@@ -73,7 +73,8 @@ public class ResetArchivePendingTask implements IMaintenanceTask
         List<SimpleDataSetInformationDTO> dataSetsToUpdate = new ArrayList<SimpleDataSetInformationDTO>();
         for (SimpleDataSetInformationDTO inArchivePending : inArchivePendings)
         {
-            if (!inQueue.contains(inArchivePending.getDataSetCode()))
+            if (inQueue.contains(inArchivePending.getDataSetCode()) == false 
+                    && inArchivePending.isPresentInArchive() == false)
             {
                 dataSetsToUpdate.add(inArchivePending);
                 operationLog.info(inArchivePending.getDataSetCode() + " not found in command queue, scheduled to update.");
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataSetCommandExecutor.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataSetCommandExecutor.java
index d62a2a1f38316557022944d3049971b255d4efc4..86e85312730c5ac59a5f6966caf799a30b6965cb 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataSetCommandExecutor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataSetCommandExecutor.java
@@ -225,25 +225,6 @@ class DataSetCommandExecutor implements IDataSetCommandExecutor
         return dataSetCodes;
     }
 
-    /**
-     * Returns the list of items in the command store of the given <var>store</var> directory.
-     */
-    public static List<IDataSetCommand> getQueuedCommands(File store)
-    {
-        List<IDataSetCommand> commands = new ArrayList<IDataSetCommand>();
-        List<File> commandQueueFiles = listCommandQueueFiles(store);
-        for (File queueFile : commandQueueFiles)
-        {
-            final IExtendedBlockingQueue<IDataSetCommand> commandQueue =
-                    PersistentExtendedBlockingQueueFactory.<IDataSetCommand> createSmartPersist(queueFile);
-            for (final IDataSetCommand cmd : commandQueue)
-            {
-                commands.add(cmd);
-            }
-        }
-        return commands;
-    }
-
     /**
      * Writes the list of items in the command store of the given <var>store</var> directory to stdout.
      */
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServerLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServerLogger.java
index e120217c32e45fe23d3f06a35bdc3eb8688d72b5..7971e8826149110c7fd926935be41db5d793ac0d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServerLogger.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServerLogger.java
@@ -422,7 +422,7 @@ public class ServiceForDataStoreServerLogger extends AbstractServerLogger implem
     public List<SimpleDataSetInformationDTO> listPhysicalDataSetsByArchivingStatus(String sessionToken, String dataStoreCode,
             DataSetArchivingStatus archivingStatus) throws UserFailureException
     {
-        logAccess(sessionToken, "listPhysicalDataSetsByArchivingStatus", "DATA_STORE(%s)", dataStoreCode);
+        logAccess(sessionToken, "listPhysicalDataSetsByArchivingStatus", "DATA_STORE(%s) STATUS(%s)", dataStoreCode, archivingStatus);
         return null;
     }