diff --git a/source/net/filebot/ui/SelectDialog.java b/source/net/filebot/ui/SelectDialog.java
index 1cce5c85..ca296241 100644
--- a/source/net/filebot/ui/SelectDialog.java
+++ b/source/net/filebot/ui/SelectDialog.java
@@ -83,7 +83,6 @@ public class SelectDialog<T> extends JDialog {
 		// add repeat button
 		if (autoRepeatEnabled) {
 			autoRepeatCheckBox.setSelected(autoRepeatSelected);
-			autoRepeatCheckBox.setToolTipText("Remember");
 			autoRepeatCheckBox.setCursor(getPredefinedCursor(HAND_CURSOR));
 			autoRepeatCheckBox.setIcon(ResourceManager.getIcon("button.repeat"));
 			autoRepeatCheckBox.setSelectedIcon(ResourceManager.getIcon("button.repeat.selected"));
diff --git a/source/net/filebot/ui/rename/AutoDetectMatcher.java b/source/net/filebot/ui/rename/AutoDetectMatcher.java
index 44c5ee06..ba62432f 100644
--- a/source/net/filebot/ui/rename/AutoDetectMatcher.java
+++ b/source/net/filebot/ui/rename/AutoDetectMatcher.java
@@ -2,6 +2,7 @@
 package net.filebot.ui.rename;
 
 import static java.util.Collections.*;
+import static java.util.Comparator.*;
 import static java.util.stream.Collectors.*;
 import static net.filebot.Logging.*;
 import static net.filebot.Settings.*;
@@ -50,10 +51,10 @@ class AutoDetectMatcher implements AutoCompleteMatcher {
 				try {
 					return it.getValue().get().stream();
 				} catch (Exception e) {
-					log.log(Level.WARNING, "Failed to process group: " + it.getKey(), e);
+					log.log(Level.WARNING, "Failed group: " + it.getKey(), e);
+					return Stream.empty();
 				}
-				return Stream.empty();
-			}).collect(toList());
+			}).sorted(comparing(Match::getValue, new OriginalOrder<File>(files))).collect(toList());
 		} finally {
 			workerThreadPool.shutdownNow();
 		}