diff --git a/Emby.Server.Implementations/Library/CoreResolutionIgnoreRule.cs b/Emby.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
index 2e69cd2efa..d782f5b888 100644
--- a/Emby.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
+++ b/Emby.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
@@ -9,6 +9,7 @@ using System.Linq;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
 
 namespace Emby.Server.Implementations.Library
 {
@@ -19,6 +20,7 @@ namespace Emby.Server.Implementations.Library
     {
         private readonly IFileSystem _fileSystem;
         private readonly ILibraryManager _libraryManager;
+        private readonly ILogger _logger;
 
         /// <summary>
         /// Any folder named in this list will be ignored - can be added to at runtime for extensibility
@@ -40,10 +42,11 @@ namespace Emby.Server.Implementations.Library
 
         };
         
-        public CoreResolutionIgnoreRule(IFileSystem fileSystem, ILibraryManager libraryManager)
+        public CoreResolutionIgnoreRule(IFileSystem fileSystem, ILibraryManager libraryManager, ILogger logger)
         {
             _fileSystem = fileSystem;
             _libraryManager = libraryManager;
+            _logger = logger;
         }
 
         /// <summary>
@@ -54,6 +57,12 @@ namespace Emby.Server.Implementations.Library
         /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
         public bool ShouldIgnore(FileSystemMetadata fileInfo, BaseItem parent)
         {
+            // Don't ignore top level folders
+            if (fileInfo.IsDirectory && parent is AggregateFolder)
+            {
+                return false;
+            }
+
             var filename = fileInfo.Name;
             var isHidden = fileInfo.IsHidden;
             var path = fileInfo.FullName;
diff --git a/RSSDP/SsdpDevicePublisherBase.cs b/RSSDP/SsdpDevicePublisherBase.cs
index 8ab35d6616..2543632b6b 100644
--- a/RSSDP/SsdpDevicePublisherBase.cs
+++ b/RSSDP/SsdpDevicePublisherBase.cs
@@ -359,7 +359,7 @@ namespace Rssdp.Infrastructure
                 
             }
 
-            WriteTrace(String.Format("Sent search response to " + endPoint.ToString()), device);
+            //WriteTrace(String.Format("Sent search response to " + endPoint.ToString()), device);
         }
 
         private bool IsDuplicateSearchRequest(string searchTarget, IpEndPointInfo endPoint)
@@ -485,7 +485,7 @@ namespace Rssdp.Infrastructure
 
             _CommsServer.SendMulticastMessage(message);
 
-            WriteTrace(String.Format("Sent alive notification"), device);
+            //WriteTrace(String.Format("Sent alive notification"), device);
         }
 
         #endregion