diff --git a/build.xml b/build.xml
index 955ecf7b..227d6b91 100644
--- a/build.xml
+++ b/build.xml
@@ -21,14 +21,6 @@
 
 		<!-- main jar -->
 		<jar destfile="${dir.dist}/filebot.jar">
-			<manifest>
-				<attribute name="Built-By" value="${user.name}" />
-				<attribute name="Built-Date" value="${today}" />
-				<attribute name="Application-Name" value="${title}" />
-				<attribute name="Application-Version" value="${version}" />
-				<attribute name="Main-Class" value="net.sourceforge.filebot.Main" />
-			</manifest>
-					
 			<fileset dir="${dir.build}" excludes="**/*Test*" />
 		</jar>
 
@@ -44,9 +36,17 @@
 		<mkdir dir="${dir.dist}/fatjar" />
 
 		<jar destfile="${dir.dist}/fatjar/FileBot.jar" filesetmanifest="merge" duplicate="fail">
+			<manifest>
+				<attribute name="Built-By" value="${user.name}" />
+				<attribute name="Built-Date" value="${today}" />
+				<attribute name="Application-Name" value="${title}" />
+				<attribute name="Application-Version" value="${version}" />
+				<attribute name="Main-Class" value="net.sourceforge.filebot.Main" />
+			</manifest>
+
 			<!-- include main jar -->
 			<zipfileset src="${dir.dist}/filebot.jar" />
-			
+
 			<!-- include libs -->
 			<zipfileset src="${dir.lib}/xercesImpl.jar">
 				<include name="org/apache/**" />
diff --git a/source/net/sourceforge/filebot/FileBotUtilities.java b/source/net/sourceforge/filebot/FileBotUtilities.java
index df75a7dd..80340609 100644
--- a/source/net/sourceforge/filebot/FileBotUtilities.java
+++ b/source/net/sourceforge/filebot/FileBotUtilities.java
@@ -38,7 +38,7 @@ public final class FileBotUtilities {
 	 * checksum string is a hex number with at least 8 digits. Capturing group 0 will contain
 	 * the matched checksum string.
 	 */
-	public static final Pattern EMBEDDED_CHECKSUM_PATTERN = Pattern.compile("(?<=\\[|\\()(\\p{XDigit}{8,})(?=\\]|\\))");
+	public static final Pattern EMBEDDED_CHECKSUM_PATTERN = Pattern.compile("(?<=\\[|\\()(\\p{XDigit}{8})(?=\\]|\\))");
 	
 
 	public static String getEmbeddedChecksum(CharSequence string) {
@@ -55,6 +55,7 @@ public final class FileBotUtilities {
 	
 
 	public static String removeEmbeddedChecksum(String string) {
+		// match embedded checksum and surrounding brackets 
 		return string.replaceAll("[\\(\\[]\\p{XDigit}{8}[\\]\\)]", "");
 	}
 	
diff --git a/source/net/sourceforge/filebot/ui/panel/subtitle/SubtitleDownloadComponent.java b/source/net/sourceforge/filebot/ui/panel/subtitle/SubtitleDownloadComponent.java
index 67449d0f..5e1bca5f 100644
--- a/source/net/sourceforge/filebot/ui/panel/subtitle/SubtitleDownloadComponent.java
+++ b/source/net/sourceforge/filebot/ui/panel/subtitle/SubtitleDownloadComponent.java
@@ -101,6 +101,11 @@ class SubtitleDownloadComponent extends JComponent {
 			}
 		};
 		
+		// better selection behaviour
+		EventSelectionModel<MemoryFile> fileSelection = new EventSelectionModel<MemoryFile>(files);
+		fileSelection.setSelectionMode(ListSelection.MULTIPLE_INTERVAL_SELECTION_DEFENSIVE);
+		fileList.setSelectionModel(fileSelection);
+		
 		// install dnd and clipboard export handler
 		MemoryFileListExportHandler memoryFileExportHandler = new MemoryFileListExportHandler();
 		fileList.setTransferHandler(new DefaultTransferHandler(null, memoryFileExportHandler, memoryFileExportHandler));
diff --git a/source/net/sourceforge/filebot/ui/panel/subtitle/SubtitlePanel.java b/source/net/sourceforge/filebot/ui/panel/subtitle/SubtitlePanel.java
index 7df2e098..d76a8e91 100644
--- a/source/net/sourceforge/filebot/ui/panel/subtitle/SubtitlePanel.java
+++ b/source/net/sourceforge/filebot/ui/panel/subtitle/SubtitlePanel.java
@@ -53,7 +53,7 @@ public class SubtitlePanel extends AbstractSearchPanel<SubtitleProvider, Subtitl
 		
 		// restore favorite languages
 		for (String favoriteLanguage : persistentFavoriteLanguages) {
-			languageModel.favorites().add(0, Language.getLanguage(favoriteLanguage));
+			languageModel.favorites().add(languageModel.favorites().size(), Language.getLanguage(favoriteLanguage));
 		}
 		
 		// guess favorite languages
@@ -75,7 +75,7 @@ public class SubtitlePanel extends AbstractSearchPanel<SubtitleProvider, Subtitl
 						
 						@Override
 						public String get(int index) {
-							return languageModel.favorites().get(0).getCode();
+							return languageModel.favorites().get(index).getCode();
 						}