diff --git a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/AdvanceOrderDAO.java b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/AdvanceOrderDAO.java
index fc96f40c6f956f950802a1eedd6fb9fb8415e0ae..d8549833abd9b81c0e9e20371fde811df7d12c3a 100644
--- a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/AdvanceOrderDAO.java
+++ b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/AdvanceOrderDAO.java
@@ -21,7 +21,6 @@ package org.olat.resource.accesscontrol.provider.auto.manager;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -94,7 +93,7 @@ class AdvanceOrderDAO {
 	}
 
 	Collection<AdvanceOrder> loadPendingAdvanceOrders(Map<IdentifierKey, String> identifiers) {
-		if (identifiers == null || identifiers.isEmpty()) return Collections.<AdvanceOrder>emptyList();
+		if (identifiers == null || identifiers.isEmpty()) return new ArrayList<>();
 
 		StringBuilder sb = new StringBuilder();
 		sb.append("select advanceOrder from advanceOrder advanceOrder")
diff --git a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/AutoAccessManagerImpl.java b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/AutoAccessManagerImpl.java
index 7d2d78083000b1c9fec693de8581494085703157..a96e49e9c387d23cbefbf93ac4f93b12046a3253 100644
--- a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/AutoAccessManagerImpl.java
+++ b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/AutoAccessManagerImpl.java
@@ -19,8 +19,8 @@
  */
 package org.olat.resource.accesscontrol.provider.auto.manager;
 
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
@@ -106,7 +106,7 @@ public class AutoAccessManagerImpl implements AutoAccessManager {
 
 	@Override
 	public Collection<AdvanceOrder> loadPendingAdvanceOrders(RepositoryEntry entry) {
-		if (entry == null) return Collections.<AdvanceOrder>emptyList();
+		if (entry == null) return new ArrayList<>();
 
 		Map<IdentifierKey, String> searchValues = new EnumMap<>(IdentifierKey.class);
 		for (IdentifierKey key: IdentifierKey.values()) {
diff --git a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/ExternalIdHandler.java b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/ExternalIdHandler.java
index ef65dbec6f9a3621711c71239b4afecfd74612f0..2165d2b69101c08558a2233ab8713f42a894f093 100644
--- a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/ExternalIdHandler.java
+++ b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/ExternalIdHandler.java
@@ -19,7 +19,7 @@
  */
 package org.olat.resource.accesscontrol.provider.auto.manager;
 
-import java.util.Collections;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.olat.repository.RepositoryEntry;
@@ -47,7 +47,7 @@ class ExternalIdHandler implements IdentifierKeyHandler {
 
 	@Override
 	public List<RepositoryEntry> find(String value) {
-		List<RepositoryEntry> entries = Collections.emptyList();;
+		List<RepositoryEntry> entries = new ArrayList<>();
 
 		try {
 			entries = repositoryService.loadRepositoryEntriesByExternalId(value);
diff --git a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/ExternalRefHandler.java b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/ExternalRefHandler.java
index 0bfa99a19d54262ee34aa050c37dd16e0597e01f..77d09bbba247cd1cb179952f768a2fe3962f98de 100644
--- a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/ExternalRefHandler.java
+++ b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/ExternalRefHandler.java
@@ -19,7 +19,7 @@
  */
 package org.olat.resource.accesscontrol.provider.auto.manager;
 
-import java.util.Collections;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.olat.repository.RepositoryEntry;
@@ -47,7 +47,7 @@ class ExternalRefHandler implements IdentifierKeyHandler {
 
 	@Override
 	public List<RepositoryEntry> find(String value) {
-		List<RepositoryEntry> entries = Collections.<RepositoryEntry>emptyList();;
+		List<RepositoryEntry> entries = new ArrayList<>();
 
 		try {
 			entries = repositoryService.loadRepositoryEntriesByExternalRef(value);
diff --git a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/InternalIdHandler.java b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/InternalIdHandler.java
index 516eb85f532968a5f9572d71daf07b38646bcd3e..9a0482ff67f3edb48e93f16f18aa323161fb8e49 100644
--- a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/InternalIdHandler.java
+++ b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/InternalIdHandler.java
@@ -19,7 +19,7 @@
  */
 package org.olat.resource.accesscontrol.provider.auto.manager;
 
-import java.util.Collections;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.olat.repository.RepositoryEntry;
@@ -41,12 +41,12 @@ class InternalIdHandler implements IdentifierKeyHandler {
 
 	@Override
 	public IdentifierKey getIdentifierKey() {
-		return IdentifierKey.externalId;
+		return IdentifierKey.internalId;
 	}
 
 	@Override
 	public List<RepositoryEntry> find(String value) {
-		List<RepositoryEntry> entries = Collections.<RepositoryEntry>emptyList();
+		List<RepositoryEntry> entries = new ArrayList<>();
 
 		try {
 			Long repositoryEntryKey = Long.parseLong(value);
diff --git a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/SemicolonSplitter.java b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/SemicolonSplitter.java
index 15aa6fad3a9ff783899d94f39d3f1019f1b3b685..67e7e2f24053c6d3325f489141e90b196e6abda9 100644
--- a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/SemicolonSplitter.java
+++ b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/SemicolonSplitter.java
@@ -19,9 +19,9 @@
  */
 package org.olat.resource.accesscontrol.provider.auto.manager;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 
 import org.springframework.stereotype.Component;
 
@@ -44,7 +44,7 @@ public class SemicolonSplitter implements IdentifierValueSplitter {
 
 	@Override
 	public Collection<String> split(String rawValue) {
-		if (rawValue == null) return Collections.<String>emptyList();
+		if (rawValue == null) return new ArrayList<>();
 
 		return Arrays.asList(rawValue.split(";"));
 	}