diff --git a/RetroFE/Source/Collection/CollectionInfoBuilder.cpp b/RetroFE/Source/Collection/CollectionInfoBuilder.cpp
index 16f5115..57cfed8 100644
--- a/RetroFE/Source/Collection/CollectionInfoBuilder.cpp
+++ b/RetroFE/Source/Collection/CollectionInfoBuilder.cpp
@@ -280,10 +280,8 @@ bool CollectionInfoBuilder::ImportDirectory(CollectionInfo *info, std::string me
     std::vector<Item *> includeFilterUnsorted;
     std::map<std::string, Item *> includeFilter;
     std::map<std::string, Item *> excludeFilter;
-    std::map<std::string, Item *> excludeAllFilter;
     std::string includeFile    = Utils::combinePath(Configuration::absolutePath, "collections", info->name, "include.txt");
     std::string excludeFile    = Utils::combinePath(Configuration::absolutePath, "collections", info->name, "exclude.txt");
-    std::string excludeAllFile = Utils::combinePath(Configuration::absolutePath, "collections", info->name, "exclude_all.txt");
 
     std::string launcher;
     bool showMissing  = false; 
@@ -315,7 +313,6 @@ bool CollectionInfoBuilder::ImportDirectory(CollectionInfo *info, std::string me
         ImportBasicList(info, includeFile, includeFilter);
         ImportBasicList(info, excludeFile, excludeFilter);
     }
-    ImportBasicList(info, excludeAllFile, excludeAllFilter);
 
     if (showMissing)
     {
@@ -366,6 +363,17 @@ bool CollectionInfoBuilder::ImportDirectory(CollectionInfo *info, std::string me
         excludeFilter.erase(it);
     }
 
+    return true;
+}
+
+
+void CollectionInfoBuilder::addPlaylists(CollectionInfo *info)
+{
+    std::map<std::string, Item *> excludeAllFilter;
+    std::string excludeAllFile = Utils::combinePath(Configuration::absolutePath, "collections", info->name, "exclude_all.txt");
+
+    ImportBasicList(info, excludeAllFile, excludeAllFilter);
+
     if ( excludeAllFilter.size() > 0)
     {
         info->playlists["all"] = new std::vector<Item *>();
@@ -406,12 +414,7 @@ bool CollectionInfoBuilder::ImportDirectory(CollectionInfo *info, std::string me
     {
         info->playlists["all"] = &info->items;
     }
-    return true;
-}
 
-
-void CollectionInfoBuilder::addPlaylists(CollectionInfo *info)
-{
     DIR *dp;
     struct dirent *dirp;
     std::string path = Utils::combinePath(Configuration::absolutePath, "collections", info->name, "playlists");
diff --git a/RetroFE/Source/Version.cpp b/RetroFE/Source/Version.cpp
index 9090da6..1d2c651 100644
--- a/RetroFE/Source/Version.cpp
+++ b/RetroFE/Source/Version.cpp
@@ -21,7 +21,7 @@
 
 std::string retrofe_version_major = "0";
 std::string retrofe_version_minor = "8";
-std::string retrofe_version_build = "21";
+std::string retrofe_version_build = "22";
 
 
 std::string Version::getString( )