diff --git a/.editorconfig b/.editorconfig
index 29e21d01ed..c63ef39430 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -33,4 +33,5 @@ dotnet_naming_style.prefix_underscore.required_prefix = _
 [*.cs]
 csharp_style_var_for_built_in_types = true:suggestion
 csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = true:suggestion
\ No newline at end of file
+csharp_style_var_elsewhere = true:suggestion
+csharp_prefer_braces = false : none
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 96014f65b7..6caeadd0e5 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -82,7 +82,6 @@ You can get in touch with [the PR team](#the-pr-team) in multiple ways, we love
 
 - If there's an existing issue on the issue tracker then that's a good place to leave questions and discuss how to start or move forward
 - Unsure where to start? Did something not work as expected? Try leaving a note in the ["Contributing to Umbraco"](https://our.umbraco.com/forum/contributing-to-umbraco-cms/) forum, the team monitors that one closely
-- We're also [active in the Gitter chatroom](https://gitter.im/umbraco/Umbraco-CMS)
 
 ## Code of Conduct
 
diff --git a/.gitignore b/.gitignore
index 529adef976..279bdb39dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,6 +107,7 @@ src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
 src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
 
 src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
+src/Umbraco.Web.UI.Client/vwd.webinfo
 
 src/Umbraco.Web.UI/App_Plugins/*
 src/*.psess
diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index adf090c69b..51d7e3b8d0 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -14,7 +14,7 @@
         <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
         <language>en-US</language>
         <tags>umbraco</tags>
-        <dependencies>
+        <dependencies> 
             <!--
               note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
               the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
@@ -25,8 +25,7 @@
             <dependency id="ClientDependency" version="[1.9.7,1.999999)" />
             <dependency id="ClientDependency-Mvc5" version="[1.8.0,1.999999)" />
             <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.999999)" />
-            <dependency id="Examine" version="[1.0.0-beta046,1.999999)" />
-            <dependency id="Lucene.Net.Contrib" version="[3.0.3,3.999999)" />
+            <dependency id="Examine" version="[1.0.0-beta067,1.999999)" />
             <dependency id="HtmlAgilityPack" version="[1.8.9,1.999999)" />
             <dependency id="ImageProcessor" version="[2.6.2.25,2.999999)" />
             <dependency id="LightInject.Mvc" version="[2.0.0,2.999999)" />
diff --git a/src/Umbraco.Core/Composing/TypeFinder.cs b/src/Umbraco.Core/Composing/TypeFinder.cs
index 9604f599cf..86d3863994 100644
--- a/src/Umbraco.Core/Composing/TypeFinder.cs
+++ b/src/Umbraco.Core/Composing/TypeFinder.cs
@@ -618,6 +618,8 @@ namespace Umbraco.Core.Composing
             // doesn't actualy load in all assemblies, only the types that have been referenced so far.
             // However, in a web context, the BuildManager will have executed which will force all assemblies
             // to be loaded so it's fine for now.
+            // It could be fairly easy to parse the typeName to get the assembly name and then do Assembly.Load and
+            // find the type from there.
 
             //now try fall back procedures.
             type = Type.GetType(typeName);
diff --git a/src/Umbraco.Core/Composing/TypeLoader.cs b/src/Umbraco.Core/Composing/TypeLoader.cs
index 27ce6db3d8..f023bf6115 100644
--- a/src/Umbraco.Core/Composing/TypeLoader.cs
+++ b/src/Umbraco.Core/Composing/TypeLoader.cs
@@ -8,6 +8,7 @@ using System.Threading;
 using System.Web;
 using System.Web.Compilation;
 using Umbraco.Core.Cache;
+using Umbraco.Core.Collections;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
@@ -31,9 +32,12 @@ namespace Umbraco.Core.Composing
         private readonly IRuntimeCacheProvider _runtimeCache;
         private readonly IProfilingLogger _logger;
 
+        private readonly Dictionary<CompositeTypeTypeKey, TypeList> _types = new Dictionary<CompositeTypeTypeKey, TypeList>();
         private readonly object _locko = new object();
-        private readonly Dictionary<TypeListKey, TypeList> _types = new Dictionary<TypeListKey, TypeList>();
+        private readonly object _timerLock = new object(); #error
 
+        private Timer _timer;
+        private bool _timing;
         private string _cachedAssembliesHash;
         private string _currentAssembliesHash;
         private IEnumerable<Assembly> _assemblies;
@@ -76,8 +80,7 @@ namespace Umbraco.Core.Composing
                     // rescanning of all types including lazy ones.
                     // http://issues.umbraco.org/issue/U4-4789
                     var typesListFilePath = GetTypesListFilePath();
-                    if (File.Exists(typesListFilePath))
-                        File.Delete(typesListFilePath);
+                    DeleteFile(typesListFilePath, FileDeleteTimeout);
 
                     WriteCacheTypesHash();
                 }
@@ -88,8 +91,7 @@ namespace Umbraco.Core.Composing
                 // rescanning of all types including lazy ones.
                 // http://issues.umbraco.org/issue/U4-4789
                 var typesListFilePath = GetTypesListFilePath();
-                if (File.Exists(typesListFilePath))
-                    File.Delete(typesListFilePath);
+                DeleteFile(typesListFilePath, FileDeleteTimeout);
 
                 // always set to true if we're not detecting (generally only for testing)
                 RequiresRescanning = true;
@@ -133,7 +135,8 @@ namespace Umbraco.Core.Composing
         // internal for tests
         internal void AddTypeList(TypeList typeList)
         {
-            _types[new TypeListKey(typeList.BaseType, typeList.AttributeType)] = typeList;
+            var tobject = typeof(object); // CompositeTypeTypeKey does not support null values
+            _types[new CompositeTypeTypeKey(typeList.BaseType ?? tobject, typeList.AttributeType ?? tobject)] = typeList;
         }
 
         #region Hashing
@@ -292,11 +295,14 @@ namespace Umbraco.Core.Composing
 
         private const int ListFileOpenReadTimeout = 4000; // milliseconds
         private const int ListFileOpenWriteTimeout = 2000; // milliseconds
+        private const int ListFileWriteThrottle = 500; // milliseconds - throttle before writing
+        private const int ListFileCacheDuration = 2 * 60; // seconds - duration we cache the entire list
+        private const int FileDeleteTimeout = 4000; // milliseconds
 
         // internal for tests
         internal Attempt<IEnumerable<string>> TryGetCached(Type baseType, Type attributeType)
         {
-            var cache = _runtimeCache.GetCacheItem<Dictionary<Tuple<string, string>, IEnumerable<string>>>(CacheKey, ReadCacheSafe, TimeSpan.FromMinutes(4));
+            var cache = _runtimeCache.GetCacheItem<Dictionary<Tuple<string, string>, IEnumerable<string>>>(CacheKey, ReadCacheSafe, TimeSpan.FromSeconds(ListFileCacheDuration));
 
             cache.TryGetValue(Tuple.Create(baseType == null ? string.Empty : baseType.FullName, attributeType == null ? string.Empty : attributeType.FullName), out IEnumerable<string> types);
             return types == null
@@ -315,7 +321,7 @@ namespace Umbraco.Core.Composing
                 try
                 {
                     var typesListFilePath = GetTypesListFilePath();
-                    File.Delete(typesListFilePath);
+                    DeleteFile(typesListFilePath, FileDeleteTimeout);
                 }
                 catch
                 {
@@ -418,6 +424,7 @@ namespace Umbraco.Core.Composing
         // internal for tests
         internal void WriteCache()
         {
+            _logger.Debug<TypeLoader>("Writing cache file.");
             var typesListFilePath = GetTypesListFilePath();
             using (var stream = GetFileStream(typesListFilePath, FileMode.Create, FileAccess.Write, FileShare.None, ListFileOpenWriteTimeout))
             using (var writer = new StreamWriter(stream))
@@ -436,11 +443,27 @@ namespace Umbraco.Core.Composing
         // internal for tests
         internal void UpdateCache()
         {
-            // note
-            // at the moment we write the cache to disk every time we update it. ideally we defer the writing
-            // since all the updates are going to happen in a row when Umbraco starts. that being said, the
-            // file is small enough, so it is not a priority.
-            WriteCache();
+            void TimerRelease(object o)
+            {
+                lock (_timerLock)
+                {
+                    try
+                    {
+                        WriteCache();
+                    }
+                    catch { /* bah - just don't die */ }
+                    if (!_timing) _timer = null;
+                }
+            }
+
+            lock (_timerLock)
+            {
+                if (_timer == null)
+                    _timer = new Timer(TimerRelease, null, ListFileWriteThrottle, Timeout.Infinite);
+                else
+                    _timer.Change(ListFileWriteThrottle, Timeout.Infinite);
+                _timing = true;
+            }
         }
 
         /// <summary>
@@ -450,12 +473,10 @@ namespace Umbraco.Core.Composing
         public void ClearTypesCache()
         {
             var typesListFilePath = GetTypesListFilePath();
-            if (File.Exists(typesListFilePath))
-                File.Delete(typesListFilePath);
+            DeleteFile(typesListFilePath, FileDeleteTimeout);
 
             var typesHashFilePath = GetTypesHashFilePath();
-            if (File.Exists(typesHashFilePath))
-                File.Delete(typesHashFilePath);
+            DeleteFile(typesHashFilePath, FileDeleteTimeout);
 
             _runtimeCache.ClearCacheItem(CacheKey);
         }
@@ -481,6 +502,27 @@ namespace Umbraco.Core.Composing
             }
         }
 
+        private void DeleteFile(string path, int timeoutMilliseconds)
+        {
+            const int pauseMilliseconds = 250;
+            var attempts = timeoutMilliseconds / pauseMilliseconds;
+            while (File.Exists(path))
+            {
+                try
+                {
+                    File.Delete(path);
+                }
+                catch
+                {
+                    if (--attempts == 0)
+                        throw;
+
+                    _logger.Debug<TypeLoader>("Attempted to delete file {Path} failed, {NumberOfAttempts} attempts left, pausing for {PauseMilliseconds} milliseconds", path, attempts, pauseMilliseconds);
+                    Thread.Sleep(pauseMilliseconds);
+                }
+            }
+        }
+
         #endregion
 
         #region Get Types
@@ -501,30 +543,37 @@ namespace Umbraco.Core.Composing
             // do not cache anything from specific assemblies
             cache &= specificAssemblies == null;
 
-            // if not caching, or not IDiscoverable, directly get types
-            if (cache == false || typeof(IDiscoverable).IsAssignableFrom(typeof(T)) == false)
+            // if not IDiscoverable, directly get types
+            if (!typeof(IDiscoverable).IsAssignableFrom(typeof(T)))
             {
-                _logger.Debug<TypeLoader>("Running a full, non-cached, scan for type {TypeName} (slow).", typeof(T).FullName);
+                // warn
+                _logger.Debug<TypeLoader>("Running a full, " + (cache ? "" : "non-") + "cached, scan for non-discoverable type {TypeName} (slow).", typeof(T).FullName);
 
                 return GetTypesInternal(
-                    typeof (T), null,
+                    typeof(T), null,
                     () => TypeFinder.FindClassesOfType<T>(specificAssemblies ?? AssembliesToScan),
+                    "scanning assemblies",
                     cache);
             }
 
-            // if caching and IDiscoverable
-            // filter the cached discovered types (and cache the result)
-
+            // get IDiscoverable and always cache
             var discovered = GetTypesInternal(
                 typeof (IDiscoverable), null,
                 () => TypeFinder.FindClassesOfType<IDiscoverable>(AssembliesToScan),
+                "scanning assemblies",
                 true);
 
+            // warn
+            if (!cache)
+                _logger.Debug<TypeLoader>("Running a non-cached, filter for discoverable type {TypeName} (slowish).", typeof(T).FullName);
+
+            // filter the cached discovered types (and maybe cache the result)
             return GetTypesInternal(
                 typeof (T), null,
                 () => discovered
                     .Where(x => typeof (T).IsAssignableFrom(x)),
-                true);
+                "filtering IDiscoverable",
+                cache);
         }
 
         /// <summary>
@@ -545,31 +594,37 @@ namespace Umbraco.Core.Composing
             // do not cache anything from specific assemblies
             cache &= specificAssemblies == null;
 
-            // if not caching, or not IDiscoverable, directly get types
-            if (cache == false || typeof(IDiscoverable).IsAssignableFrom(typeof(T)) == false)
+            // if not IDiscoverable, directly get types
+            if (!typeof(IDiscoverable).IsAssignableFrom(typeof(T)))
             {
-                _logger.Debug<TypeLoader>("Running a full, non-cached, scan for type {TypeName} / attribute {AttributeName} (slow).", typeof(T).FullName, typeof(TAttribute).FullName);
+                _logger.Debug<TypeLoader>("Running a full, " + (cache ? "" : "non-") + "cached, scan for non-discoverable type {TypeName} / attribute {AttributeName} (slow).", typeof(T).FullName, typeof(TAttribute).FullName);
 
                 return GetTypesInternal(
-                    typeof (T), typeof (TAttribute),
+                    typeof(T), typeof(TAttribute),
                     () => TypeFinder.FindClassesOfTypeWithAttribute<T, TAttribute>(specificAssemblies ?? AssembliesToScan),
+                    "scanning assemblies",
                     cache);
             }
 
-            // if caching and IDiscoverable
-            // filter the cached discovered types (and cache the result)
-
+            // get IDiscoverable and always cache
             var discovered = GetTypesInternal(
                 typeof (IDiscoverable), null,
                 () => TypeFinder.FindClassesOfType<IDiscoverable>(AssembliesToScan),
+                "scanning assemblies",
                 true);
 
+            // warn
+            if (!cache)
+                _logger.Debug<TypeLoader>("Running a non-cached, filter for discoverable type {TypeName}  / attribute {AttributeName} (slowish).", typeof(T).FullName, typeof(TAttribute).FullName);
+
+            // filter the cached discovered types (and maybe cache the result)
             return GetTypesInternal(
                 typeof (T), typeof (TAttribute),
                 () => discovered
                     .Where(x => typeof(T).IsAssignableFrom(x))
                     .Where(x => x.GetCustomAttributes<TAttribute>(false).Any()),
-                true);
+                "filtering IDiscoverable",
+                cache);
         }
 
         /// <summary>
@@ -589,20 +644,20 @@ namespace Umbraco.Core.Composing
             // do not cache anything from specific assemblies
             cache &= specificAssemblies == null;
 
-            if (cache == false)
-            {
+            if (!cache)
                 _logger.Debug<TypeLoader>("Running a full, non-cached, scan for types / attribute {AttributeName} (slow).", typeof(TAttribute).FullName);
-            }
 
             return GetTypesInternal(
                 typeof (object), typeof (TAttribute),
                 () => TypeFinder.FindClassesWithAttribute<TAttribute>(specificAssemblies ?? AssembliesToScan),
+                "scanning assemblies",
                 cache);
         }
 
         private IEnumerable<Type> GetTypesInternal(
             Type baseType, Type attributeType,
             Func<IEnumerable<Type>> finder,
+            string action,
             bool cache)
         {
             // using an upgradeable lock makes little sense here as only one thread can enter the upgradeable
@@ -618,7 +673,7 @@ namespace Umbraco.Core.Composing
                 "Got " + name)) // cannot contain typesFound.Count as it's evaluated before the find
             {
                 // get within a lock & timer
-                return GetTypesInternalLocked(baseType, attributeType, finder, cache);
+                return GetTypesInternalLocked(baseType, attributeType, finder, action, cache);
             }
         }
 
@@ -632,10 +687,12 @@ namespace Umbraco.Core.Composing
         private IEnumerable<Type> GetTypesInternalLocked(
             Type baseType, Type attributeType,
             Func<IEnumerable<Type>> finder,
+            string action,
             bool cache)
         {
             // check if the TypeList already exists, if so return it, if not we'll create it
-            var listKey = new TypeListKey(baseType, attributeType);
+            var tobject = typeof(object); // CompositeTypeTypeKey does not support null values
+            var listKey = new CompositeTypeTypeKey(baseType ?? tobject, attributeType ?? tobject);
             TypeList typeList = null;
             if (cache)
                 _types.TryGetValue(listKey, out typeList); // else null
@@ -710,7 +767,7 @@ namespace Umbraco.Core.Composing
             if (scan)
             {
                 // either we had to scan, or we could not get the types from the cache file - scan now
-                _logger.Debug<TypeLoader>("Getting {TypeName}: scanning assemblies.", GetName(baseType, attributeType));
+                _logger.Debug<TypeLoader>("Getting {TypeName}: " + action + ".", GetName(baseType, attributeType));
 
                 foreach (var t in finder())
                     typeList.Add(t);
@@ -742,41 +799,6 @@ namespace Umbraco.Core.Composing
 
         #region Nested classes and stuff
 
-        /// <summary>
-        /// Groups a type and a resolution kind into a key.
-        /// </summary>
-        private struct TypeListKey
-        {
-            // ReSharper disable MemberCanBePrivate.Local
-            public readonly Type BaseType;
-            public readonly Type AttributeType;
-            // ReSharper restore MemberCanBePrivate.Local
-
-            public TypeListKey(Type baseType, Type attributeType)
-            {
-                BaseType = baseType ?? typeof (object);
-                AttributeType = attributeType;
-            }
-
-            public override bool Equals(object obj)
-            {
-                if (obj == null || obj is TypeListKey == false) return false;
-                var o = (TypeListKey)obj;
-                return BaseType == o.BaseType && AttributeType == o.AttributeType;
-            }
-
-            public override int GetHashCode()
-            {
-                // in case AttributeType is null we need something else, using typeof (TypeListKey)
-                // which does not really "mean" anything, it's just a value...
-
-                var hash = 5381;
-                hash = ((hash << 5) + hash) ^ BaseType.GetHashCode();
-                hash = ((hash << 5) + hash) ^ (AttributeType ?? typeof (TypeListKey)).GetHashCode();
-                return hash;
-            }
-        }
-
         /// <summary>
         /// Represents a list of types obtained by looking for types inheriting/implementing a
         /// specified type, and/or marked with a specified attribute type.
diff --git a/src/Umbraco.Core/Migrations/IPostMigration.cs b/src/Umbraco.Core/Migrations/IPostMigration.cs
index 827a09e882..15daf0fc74 100644
--- a/src/Umbraco.Core/Migrations/IPostMigration.cs
+++ b/src/Umbraco.Core/Migrations/IPostMigration.cs
@@ -1,10 +1,11 @@
 using Semver;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Migrations
 {
-    public interface IPostMigration
+    public interface IPostMigration : IDiscoverable
     {
         void Execute(string name, IScope scope, SemVersion originVersion, SemVersion targetVersion, ILogger logger);
     }
diff --git a/src/Umbraco.Core/Persistence/Repositories/IEntityRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IEntityRepository.cs
index b53b117a1a..69f6ef4c5f 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IEntityRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IEntityRepository.cs
@@ -4,6 +4,7 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
@@ -30,6 +31,6 @@ namespace Umbraco.Core.Persistence.Repositories
         bool Exists(Guid key);
 
         IEnumerable<IEntitySlim> GetPagedResultsByQuery(IQuery<IUmbracoEntity> query, Guid objectType, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy, Direction orderDirection, IQuery<IUmbracoEntity> filter = null);
+            IQuery<IUmbracoEntity> filter, Ordering ordering);
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
index 8d6f67e9db..2be27deb0a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
@@ -10,6 +10,7 @@ using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Scoping;
 using static Umbraco.Core.Persistence.NPocoSqlExtensions.Statics;
 using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Core.Persistence.Repositories.Implement
 {
@@ -25,12 +26,10 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
     internal class EntityRepository : IEntityRepository
     {
         private readonly IScopeAccessor _scopeAccessor;
-        private readonly ILanguageRepository _langRepository;
 
-        public EntityRepository(IScopeAccessor scopeAccessor, ILanguageRepository langRepository)
+        public EntityRepository(IScopeAccessor scopeAccessor)
         {
             _scopeAccessor = scopeAccessor;
-            _langRepository = langRepository;
         }
 
         protected IUmbracoDatabase Database => _scopeAccessor.AmbientScope.Database;
@@ -41,7 +40,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         // get a page of entities
         public IEnumerable<IEntitySlim> GetPagedResultsByQuery(IQuery<IUmbracoEntity> query, Guid objectType, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy, Direction orderDirection, IQuery<IUmbracoEntity> filter = null)
+            IQuery<IUmbracoEntity> filter, Ordering ordering)
         {
             var isContent = objectType == Constants.ObjectTypes.Document || objectType == Constants.ObjectTypes.DocumentBlueprint;
             var isMedia = objectType == Constants.ObjectTypes.Media;
@@ -53,11 +52,21 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                     x.Where(filterClause.Item1, filterClause.Item2);
             }, objectType);
 
+            ordering = ordering ?? Ordering.ByDefault();
+
             var translator = new SqlTranslator<IUmbracoEntity>(sql, query);
             sql = translator.Translate();
-            sql = AddGroupBy(isContent, isMedia, sql);
+            sql = AddGroupBy(isContent, isMedia, sql, ordering.IsEmpty);
+
+            if (!ordering.IsEmpty)
+            {
+                // apply ordering
+                ApplyOrdering(ref sql, ordering);
+            }
+
             //fixme - we should be able to do sql = sql.OrderBy(x => Alias(x.NodeId, "NodeId")); but we can't because the OrderBy extension don't support Alias currently
-            sql = sql.OrderBy("NodeId");
+            //no matter what we always must have node id ordered at the end
+            sql = ordering.Direction == Direction.Ascending ? sql.OrderBy("NodeId") : sql.OrderByDescending("NodeId");
 
             var page = Database.Page<BaseDto>(pageIndex + 1, pageSize, sql);
             var dtos = page.Items;
@@ -81,6 +90,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             return dto == null ? null : BuildEntity(false, false, dto);
         }
 
+
         private IEntitySlim GetEntity(Sql<ISqlContext> sql, bool isContent, bool isMedia)
         {
             //isContent is going to return a 1:M result now with the variants so we need to do different things
@@ -200,7 +210,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             var sqlClause = GetBase(false, false, null);
             var translator = new SqlTranslator<IUmbracoEntity>(sqlClause, query);
             var sql = translator.Translate();
-            sql = AddGroupBy(false, false, sql);
+            sql = AddGroupBy(false, false, sql, true);
             var dtos = Database.Fetch<BaseDto>(sql);
             return dtos.Select(x => BuildEntity(false, false, x)).ToList();
         }
@@ -214,7 +224,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
             var translator = new SqlTranslator<IUmbracoEntity>(sql, query);
             sql = translator.Translate();
-            sql = AddGroupBy(isContent, isMedia, sql);
+            sql = AddGroupBy(isContent, isMedia, sql, true);
 
             return GetEntities(sql, isContent, isMedia, true);
         }
@@ -229,7 +239,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
             var translator = new SqlTranslator<IUmbracoEntity>(sql, query);
             sql = translator.Translate();
-            sql = AddGroupBy(isContent, isMedia, sql);
+            sql = AddGroupBy(isContent, isMedia, sql, true);
 
             return GetEntities(sql, isContent, isMedia, false);
         }
@@ -361,21 +371,21 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         protected Sql<ISqlContext> GetFullSqlForEntityType(bool isContent, bool isMedia, Guid objectType, Guid uniqueId)
         {
             var sql = GetBaseWhere(isContent, isMedia, false, objectType, uniqueId);
-            return AddGroupBy(isContent, isMedia, sql);
+            return AddGroupBy(isContent, isMedia, sql, true);
         }
 
         // gets the full sql for a given object type and a given node id
         protected Sql<ISqlContext> GetFullSqlForEntityType(bool isContent, bool isMedia, Guid objectType, int nodeId)
         {
             var sql = GetBaseWhere(isContent, isMedia, false, objectType, nodeId);
-            return AddGroupBy(isContent, isMedia, sql);
+            return AddGroupBy(isContent, isMedia, sql, true);
         }
 
         // gets the full sql for a given object type, with a given filter
         protected Sql<ISqlContext> GetFullSqlForEntityType(bool isContent, bool isMedia, Guid objectType, Action<Sql<ISqlContext>> filter)
         {
             var sql = GetBaseWhere(isContent, isMedia, false, filter, objectType);
-            return AddGroupBy(isContent, isMedia, sql);
+            return AddGroupBy(isContent, isMedia, sql, true);
         }
 
         private Sql<ISqlContext> GetPropertyData(int versionId)
@@ -401,7 +411,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         // gets the base SELECT + FROM [+ filter] sql
         // always from the 'current' content version
-        protected virtual Sql<ISqlContext> GetBase(bool isContent, bool isMedia, Action<Sql<ISqlContext>> filter, bool isCount = false)
+        protected Sql<ISqlContext> GetBase(bool isContent, bool isMedia, Action<Sql<ISqlContext>> filter, bool isCount = false)
         {
             var sql = Sql();
 
@@ -460,7 +470,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         // gets the base SELECT + FROM [+ filter] + WHERE sql
         // for a given object type, with a given filter
-        protected virtual Sql<ISqlContext> GetBaseWhere(bool isContent, bool isMedia, bool isCount, Action<Sql<ISqlContext>> filter, Guid objectType)
+        protected Sql<ISqlContext> GetBaseWhere(bool isContent, bool isMedia, bool isCount, Action<Sql<ISqlContext>> filter, Guid objectType)
         {
             return GetBase(isContent, isMedia, filter, isCount)
                 .Where<NodeDto>(x => x.NodeObjectType == objectType);
@@ -468,25 +478,25 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         // gets the base SELECT + FROM + WHERE sql
         // for a given node id
-        protected virtual Sql<ISqlContext> GetBaseWhere(bool isContent, bool isMedia, bool isCount, int id)
+        protected Sql<ISqlContext> GetBaseWhere(bool isContent, bool isMedia, bool isCount, int id)
         {
             var sql = GetBase(isContent, isMedia, null, isCount)
                 .Where<NodeDto>(x => x.NodeId == id);
-            return AddGroupBy(isContent, isMedia, sql);
+            return AddGroupBy(isContent, isMedia, sql, true);
         }
 
         // gets the base SELECT + FROM + WHERE sql
         // for a given unique id
-        protected virtual Sql<ISqlContext> GetBaseWhere(bool isContent, bool isMedia, bool isCount, Guid uniqueId)
+        protected Sql<ISqlContext> GetBaseWhere(bool isContent, bool isMedia, bool isCount, Guid uniqueId)
         {
             var sql = GetBase(isContent, isMedia, null, isCount)
                 .Where<NodeDto>(x => x.UniqueId == uniqueId);
-            return AddGroupBy(isContent, isMedia, sql);
+            return AddGroupBy(isContent, isMedia, sql, true);
         }
 
         // gets the base SELECT + FROM + WHERE sql
         // for a given object type and node id
-        protected virtual Sql<ISqlContext> GetBaseWhere(bool isContent, bool isMedia, bool isCount, Guid objectType, int nodeId)
+        protected Sql<ISqlContext> GetBaseWhere(bool isContent, bool isMedia, bool isCount, Guid objectType, int nodeId)
         {
             return GetBase(isContent, isMedia, null, isCount)
                 .Where<NodeDto>(x => x.NodeId == nodeId && x.NodeObjectType == objectType);
@@ -494,7 +504,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         // gets the base SELECT + FROM + WHERE sql
         // for a given object type and unique id
-        protected virtual Sql<ISqlContext> GetBaseWhere(bool isContent, bool isMedia, bool isCount, Guid objectType, Guid uniqueId)
+        protected Sql<ISqlContext> GetBaseWhere(bool isContent, bool isMedia, bool isCount, Guid objectType, Guid uniqueId)
         {
             return GetBase(isContent, isMedia, null, isCount)
                 .Where<NodeDto>(x => x.UniqueId == uniqueId && x.NodeObjectType == objectType);
@@ -502,7 +512,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         // gets the GROUP BY / ORDER BY sql
         // required in order to count children
-        protected virtual Sql<ISqlContext> AddGroupBy(bool isContent, bool isMedia, Sql<ISqlContext> sql, bool sort = true)
+        protected Sql<ISqlContext> AddGroupBy(bool isContent, bool isMedia, Sql<ISqlContext> sql, bool defaultSort)
         {
             sql
                 .GroupBy<NodeDto>(x => x.NodeId, x => x.Trashed, x => x.ParentId, x => x.UserId, x => x.Level, x => x.Path)
@@ -520,12 +530,26 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                     .AndBy<ContentVersionDto>(x => x.Id)
                     .AndBy<ContentTypeDto>(x => x.Alias, x => x.Icon, x => x.Thumbnail, x => x.IsContainer, x => x.Variations);
 
-            if (sort)
+            if (defaultSort)
                 sql.OrderBy<NodeDto>(x => x.SortOrder);
 
             return sql;
         }
 
+        private void ApplyOrdering(ref Sql<ISqlContext> sql, Ordering ordering)
+        {
+            if (sql == null) throw new ArgumentNullException(nameof(sql));
+            if (ordering == null) throw new ArgumentNullException(nameof(ordering));
+
+            //fixme - although this works for name, it probably doesn't work for others without an alias of some sort
+            var orderBy = ordering.OrderBy;
+
+            if (ordering.Direction == Direction.Ascending)
+                sql.OrderBy(orderBy);
+            else
+                sql.OrderByDescending(orderBy);
+        }
+
         #endregion
 
         #region Classes
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
index b14c7659a3..17fe79a55b 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
@@ -423,6 +423,7 @@ ORDER BY colName";
             {
                 "DELETE FROM umbracoUser2UserGroup WHERE userId = @id",
                 "DELETE FROM umbracoUser2NodeNotify WHERE userId = @id",
+                "DELETE FROM umbracoUserStartNode WHERE userId = @id",
                 "DELETE FROM umbracoUser WHERE id = @id",
                 "DELETE FROM umbracoExternalLogin WHERE id = @id"
             };
diff --git a/src/Umbraco.Core/Services/IEntityService.cs b/src/Umbraco.Core/Services/IEntityService.cs
index 926afcf0a9..3937d5bf40 100644
--- a/src/Umbraco.Core/Services/IEntityService.cs
+++ b/src/Umbraco.Core/Services/IEntityService.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Querying;
 
 namespace Umbraco.Core.Services
 {
@@ -227,25 +228,25 @@ namespace Umbraco.Core.Services
         /// Gets children of an entity.
         /// </summary>
         IEnumerable<IEntitySlim> GetPagedChildren(int id, UmbracoObjectTypes objectType, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy = "SortOrder", Direction orderDirection = Direction.Ascending, string filter = "");
+            IQuery<IUmbracoEntity> filter = null, Ordering ordering = null);
 
         /// <summary>
         /// Gets descendants of an entity.
         /// </summary>
         IEnumerable<IEntitySlim> GetPagedDescendants(int id, UmbracoObjectTypes objectType, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "");
+            IQuery<IUmbracoEntity> filter = null, Ordering ordering = null);
 
         /// <summary>
         /// Gets descendants of entities.
         /// </summary>
         IEnumerable<IEntitySlim> GetPagedDescendants(IEnumerable<int> ids, UmbracoObjectTypes objectType, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "");
+            IQuery<IUmbracoEntity> filter = null, Ordering ordering = null);
 
         /// <summary>
-        /// Gets descendants of root.
+        /// Gets descendants of root. fixme: Do we really need this? why not just pass in -1
         /// </summary>
         IEnumerable<IEntitySlim> GetPagedDescendants(UmbracoObjectTypes objectType, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "", bool includeTrashed = true);
+            IQuery<IUmbracoEntity> filter = null, Ordering ordering = null, bool includeTrashed = true);
 
         /// <summary>
         /// Gets the object type of an entity.
diff --git a/src/Umbraco.Core/Services/Implement/EntityService.cs b/src/Umbraco.Core/Services/Implement/EntityService.cs
index 45c229214a..4a3db29940 100644
--- a/src/Umbraco.Core/Services/Implement/EntityService.cs
+++ b/src/Umbraco.Core/Services/Implement/EntityService.cs
@@ -415,20 +415,19 @@ namespace Umbraco.Core.Services.Implement
 
         /// <inheritdoc />
         public IEnumerable<IEntitySlim> GetPagedChildren(int id, UmbracoObjectTypes objectType, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy = "SortOrder", Direction orderDirection = Direction.Ascending, string filter = "")
+            IQuery<IUmbracoEntity> filter = null, Ordering ordering = null)
         {
             using (ScopeProvider.CreateScope(autoComplete: true))
             {
                 var query = Query<IUmbracoEntity>().Where(x => x.ParentId == id && x.Trashed == false);
 
-                var filterQuery = string.IsNullOrWhiteSpace(filter) ? null : Query<IUmbracoEntity>().Where(x => x.Name.Contains(filter));
-                return _entityRepository.GetPagedResultsByQuery(query, objectType.GetGuid(), pageIndex, pageSize, out totalRecords, orderBy, orderDirection, filterQuery);
+                return _entityRepository.GetPagedResultsByQuery(query, objectType.GetGuid(), pageIndex, pageSize, out totalRecords, filter, ordering);
             }
         }
 
         /// <inheritdoc />
         public IEnumerable<IEntitySlim> GetPagedDescendants(int id, UmbracoObjectTypes objectType, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "")
+            IQuery<IUmbracoEntity> filter = null, Ordering ordering = null)
         {
             using (ScopeProvider.CreateScope(autoComplete: true))
             {
@@ -448,14 +447,13 @@ namespace Umbraco.Core.Services.Implement
                     query.Where(x => x.Path.SqlStartsWith(path + ",", TextColumnType.NVarchar));
                 }
 
-                var filterQuery = string.IsNullOrWhiteSpace(filter) ? null : Query<IUmbracoEntity>().Where(x => x.Name.Contains(filter));
-                return _entityRepository.GetPagedResultsByQuery(query, objectTypeGuid, pageIndex, pageSize, out totalRecords, orderBy, orderDirection, filterQuery);
+                return _entityRepository.GetPagedResultsByQuery(query, objectTypeGuid, pageIndex, pageSize, out totalRecords, filter, ordering);
             }
         }
 
         /// <inheritdoc />
         public IEnumerable<IEntitySlim> GetPagedDescendants(IEnumerable<int> ids, UmbracoObjectTypes objectType, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "")
+            IQuery<IUmbracoEntity> filter = null, Ordering ordering = null)
         {
             totalRecords = 0;
 
@@ -492,14 +490,13 @@ namespace Umbraco.Core.Services.Implement
                     query.WhereAny(clauses);
                 }
 
-                var filterQuery = string.IsNullOrWhiteSpace(filter) ? null : Query<IUmbracoEntity>().Where(x => x.Name.Contains(filter));
-                return _entityRepository.GetPagedResultsByQuery(query, objectTypeGuid, pageIndex, pageSize, out totalRecords, orderBy, orderDirection, filterQuery);
+                return _entityRepository.GetPagedResultsByQuery(query, objectTypeGuid, pageIndex, pageSize, out totalRecords, filter, ordering);
             }
         }
 
         /// <inheritdoc />
         public IEnumerable<IEntitySlim> GetPagedDescendants(UmbracoObjectTypes objectType, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy = "path", Direction orderDirection = Direction.Ascending, string filter = "", bool includeTrashed = true)
+            IQuery<IUmbracoEntity> filter = null, Ordering ordering = null, bool includeTrashed = true)
         {
             using (ScopeProvider.CreateScope(autoComplete: true))
             {
@@ -507,8 +504,7 @@ namespace Umbraco.Core.Services.Implement
                 if (includeTrashed == false)
                     query.Where(x => x.Trashed == false);
 
-                var filterQuery = string.IsNullOrWhiteSpace(filter) ? null : Query<IUmbracoEntity>().Where(x => x.Name.Contains(filter));
-                return _entityRepository.GetPagedResultsByQuery(query, objectType.GetGuid(), pageIndex, pageSize, out totalRecords, orderBy, orderDirection, filterQuery);
+                return _entityRepository.GetPagedResultsByQuery(query, objectType.GetGuid(), pageIndex, pageSize, out totalRecords, filter, ordering);
             }
         }
 
diff --git a/src/Umbraco.Examine/ContentIndexPopulator.cs b/src/Umbraco.Examine/ContentIndexPopulator.cs
index d1255b4d46..72615b4b26 100644
--- a/src/Umbraco.Examine/ContentIndexPopulator.cs
+++ b/src/Umbraco.Examine/ContentIndexPopulator.cs
@@ -15,7 +15,7 @@ namespace Umbraco.Examine
     /// <summary>
     /// Performs the data lookups required to rebuild a content index
     /// </summary>
-    public class ContentIndexPopulator : IndexPopulator
+    public class ContentIndexPopulator : IndexPopulator<UmbracoContentIndex>
     {
         private readonly IContentService _contentService;
         private readonly IValueSetBuilder<IContent> _contentValueSetBuilder;
@@ -56,9 +56,6 @@ namespace Umbraco.Examine
                 _publishedQuery = sqlContext.Query<IContent>().Where(x => x.Published);
             _publishedValuesOnly = publishedValuesOnly;
             _parentId = parentId;
-
-            RegisterIndex(Constants.UmbracoIndexes.InternalIndexName);
-            RegisterIndex(Constants.UmbracoIndexes.ExternalIndexName);
         }
 
         protected override void PopulateIndexes(IEnumerable<IIndex> indexes)
diff --git a/src/Umbraco.Examine/IIndexPopulator.cs b/src/Umbraco.Examine/IIndexPopulator.cs
index aeb3514578..153e88d46b 100644
--- a/src/Umbraco.Examine/IIndexPopulator.cs
+++ b/src/Umbraco.Examine/IIndexPopulator.cs
@@ -3,12 +3,14 @@ using Examine;
 
 namespace Umbraco.Examine
 {
-    
-
     public interface IIndexPopulator
     {
-        bool IsRegistered(string indexName);
-        void RegisterIndex(string indexName);
+        /// <summary>
+        /// If this index is registered with this populatr
+        /// </summary>
+        /// <param name="index"></param>
+        /// <returns></returns>
+        bool IsRegistered(IIndex index);
 
         /// <summary>
         /// Populate indexers 
diff --git a/src/Umbraco.Examine/IUmbracoIndexer.cs b/src/Umbraco.Examine/IUmbracoIndex.cs
similarity index 72%
rename from src/Umbraco.Examine/IUmbracoIndexer.cs
rename to src/Umbraco.Examine/IUmbracoIndex.cs
index 00f772b1e2..9461434fff 100644
--- a/src/Umbraco.Examine/IUmbracoIndexer.cs
+++ b/src/Umbraco.Examine/IUmbracoIndex.cs
@@ -1,11 +1,12 @@
-using Examine;
+using System.Collections.Generic;
+using Examine;
 
 namespace Umbraco.Examine
 {
     /// <summary>
     /// A Marker interface for defining an Umbraco indexer
     /// </summary>
-    public interface IUmbracoIndexer : IIndex
+    public interface IUmbracoIndex : IIndex
     {
         /// <summary>
         /// When set to true Umbraco will keep the index in sync with Umbraco data automatically
@@ -21,5 +22,11 @@ namespace Umbraco.Examine
         /// * non-published Variants
         /// </remarks>
         bool PublishedValuesOnly { get; }
+
+        /// <summary>
+        /// Returns a list of all indexed fields
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<string> GetFields();
     }
 }
diff --git a/src/Umbraco.Examine/IndexPopulator.cs b/src/Umbraco.Examine/IndexPopulator.cs
index 5f701312ea..9cd985df16 100644
--- a/src/Umbraco.Examine/IndexPopulator.cs
+++ b/src/Umbraco.Examine/IndexPopulator.cs
@@ -5,13 +5,26 @@ using Umbraco.Core.Collections;
 
 namespace Umbraco.Examine
 {
+    /// <summary>
+    /// An <see cref="IIndexPopulator"/> that is automatically associated to any index of type <see cref="TIndex"/>
+    /// </summary>
+    /// <typeparam name="TIndex"></typeparam>
+    public abstract class IndexPopulator<TIndex> : IndexPopulator where TIndex : IIndex
+    {
+        public override bool IsRegistered(IIndex index)
+        {
+            if (base.IsRegistered(index)) return true;
+            return index is TIndex;
+        }
+    }
+
     public abstract class IndexPopulator : IIndexPopulator
     {
         private readonly ConcurrentHashSet<string> _registeredIndexes = new ConcurrentHashSet<string>();
 
-        public bool IsRegistered(string indexName)
+        public virtual bool IsRegistered(IIndex index)
         {
-            return _registeredIndexes.Contains(indexName);
+            return _registeredIndexes.Contains(index.Name);
         }
 
         /// <summary>
@@ -25,7 +38,7 @@ namespace Umbraco.Examine
 
         public void Populate(params IIndex[] indexes)
         {
-            PopulateIndexes(indexes.Where(x => IsRegistered(x.Name)));
+            PopulateIndexes(indexes.Where(IsRegistered));
         }
 
         protected abstract void PopulateIndexes(IEnumerable<IIndex> indexes);
diff --git a/src/Umbraco.Examine/IndexRebuilder.cs b/src/Umbraco.Examine/IndexRebuilder.cs
index 39b29c5a2b..d946a8f783 100644
--- a/src/Umbraco.Examine/IndexRebuilder.cs
+++ b/src/Umbraco.Examine/IndexRebuilder.cs
@@ -20,9 +20,9 @@ namespace Umbraco.Examine
             ExamineManager = examineManager;
         }
 
-        public bool CanRebuild(string indexName)
+        public bool CanRebuild(IIndex index)
         {
-            return _populators.Any(x => x.IsRegistered(indexName));
+            return _populators.Any(x => x.IsRegistered(index));
         }
 
         public void RebuildIndex(string indexName)
diff --git a/src/Umbraco.Examine/LuceneIndexCreator.cs b/src/Umbraco.Examine/LuceneIndexCreator.cs
index 572de1e8a8..0e83b37dc5 100644
--- a/src/Umbraco.Examine/LuceneIndexCreator.cs
+++ b/src/Umbraco.Examine/LuceneIndexCreator.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
 using System.IO;
 using Examine;
 using Examine.LuceneEngine.Directories;
 using Lucene.Net.Store;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 
 namespace Umbraco.Examine
@@ -18,17 +22,30 @@ namespace Umbraco.Examine
         /// <summary>
         /// Creates a file system based Lucene <see cref="Lucene.Net.Store.Directory"/> with the correct locking guidelines for Umbraco
         /// </summary>
-        /// <param name="name"></param>
+        /// <param name="folderName">
+        /// The folder name to store the index (single word, not a fully qualified folder) (i.e. Internal)
+        /// </param>
         /// <returns></returns>
-        public virtual Lucene.Net.Store.Directory CreateFileSystemLuceneDirectory(string name)
+        public virtual Lucene.Net.Store.Directory CreateFileSystemLuceneDirectory(string folderName)
         {
-            //TODO: We should have a single AppSetting to be able to specify a default DirectoryFactory so we can have a single
-            //setting to configure all indexes that use this to easily swap the directory to Sync/%temp%/blog, etc...
-
-            var dirInfo = new DirectoryInfo(Path.Combine(IOHelper.MapPath(SystemDirectories.Data), "TEMP", "ExamineIndexes", name));
+            
+            var dirInfo = new DirectoryInfo(Path.Combine(IOHelper.MapPath(SystemDirectories.Data), "TEMP", "ExamineIndexes", folderName));
             if (!dirInfo.Exists)
                 System.IO.Directory.CreateDirectory(dirInfo.FullName);
 
+            //check if there's a configured directory factory, if so create it and use that to create the lucene dir
+            var configuredDirectoryFactory = ConfigurationManager.AppSettings["Umbraco.Examine.LuceneDirectoryFactory"];
+            if (!configuredDirectoryFactory.IsNullOrWhiteSpace())
+            {
+                //this should be a fully qualified type
+                var factoryType = TypeFinder.GetTypeByName(configuredDirectoryFactory);
+                if (factoryType == null) throw new NullReferenceException("No directory type found for value: " + configuredDirectoryFactory);
+                var directoryFactory = (IDirectoryFactory)Activator.CreateInstance(factoryType);
+                return directoryFactory.CreateDirectory(dirInfo);
+            }
+
+            //no dir factory, just create a normal fs directory
+
             var luceneDir = new SimpleFSDirectory(dirInfo);
 
             //we want to tell examine to use a different fs lock instead of the default NativeFSFileLock which could cause problems if the appdomain
@@ -38,6 +55,8 @@ namespace Umbraco.Examine
             // however, we are setting the DefaultLockFactory in startup so we'll use that instead since it can be managed globally.
             luceneDir.SetLockFactory(DirectoryFactory.DefaultLockFactory(dirInfo));
             return luceneDir;
+
+
         }
     }
 }
diff --git a/src/Umbraco.Examine/MediaIndexPopulator.cs b/src/Umbraco.Examine/MediaIndexPopulator.cs
index 39a0b3f7c8..2232d359e7 100644
--- a/src/Umbraco.Examine/MediaIndexPopulator.cs
+++ b/src/Umbraco.Examine/MediaIndexPopulator.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Examine
     /// <summary>
     /// Performs the data lookups required to rebuild a media index
     /// </summary>
-    public class MediaIndexPopulator : IndexPopulator
+    public class MediaIndexPopulator : IndexPopulator<UmbracoContentIndex>
     {
         private readonly int? _parentId;
         private readonly IMediaService _mediaService;
@@ -37,9 +37,6 @@ namespace Umbraco.Examine
             _parentId = parentId;
             _mediaService = mediaService;
             _mediaValueSetBuilder = mediaValueSetBuilder;
-
-            RegisterIndex(Constants.UmbracoIndexes.InternalIndexName);
-            RegisterIndex(Constants.UmbracoIndexes.ExternalIndexName);
         }
 
         protected override void PopulateIndexes(IEnumerable<IIndex> indexes)
diff --git a/src/Umbraco.Examine/MemberIndexPopulator.cs b/src/Umbraco.Examine/MemberIndexPopulator.cs
index cf04861372..6e97ee9195 100644
--- a/src/Umbraco.Examine/MemberIndexPopulator.cs
+++ b/src/Umbraco.Examine/MemberIndexPopulator.cs
@@ -7,7 +7,7 @@ using Umbraco.Core.Services;
 
 namespace Umbraco.Examine
 {
-    public class MemberIndexPopulator : IndexPopulator
+    public class MemberIndexPopulator : IndexPopulator<UmbracoMemberIndex>
     {
         private readonly IMemberService _memberService;
         private readonly IValueSetBuilder<IMember> _valueSetBuilder;
@@ -16,8 +16,6 @@ namespace Umbraco.Examine
         {
             _memberService = memberService;
             _valueSetBuilder = valueSetBuilder;
-
-            RegisterIndex(Core.Constants.UmbracoIndexes.MembersIndexName);
         }
         protected override void PopulateIndexes(IEnumerable<IIndex> indexes)
         {
diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj
index 66b1f09068..2bdf6f833d 100644
--- a/src/Umbraco.Examine/Umbraco.Examine.csproj
+++ b/src/Umbraco.Examine/Umbraco.Examine.csproj
@@ -48,7 +48,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- note: NuGet deals with transitive references now -->
-    <PackageReference Include="Examine" Version="1.0.0-beta046" />
+    <PackageReference Include="Examine" Version="1.0.0-beta067" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="NPoco" Version="3.9.4" />
   </ItemGroup>
@@ -72,7 +72,7 @@
     <Compile Include="IndexPopulator.cs" />
     <Compile Include="IndexRebuilder.cs" />
     <Compile Include="IPublishedContentValueSetBuilder.cs" />
-    <Compile Include="IUmbracoIndexer.cs" />
+    <Compile Include="IUmbracoIndex.cs" />
     <Compile Include="IValueSetBuilder.cs" />
     <Compile Include="MediaIndexPopulator.cs" />
     <Compile Include="MediaValueSetBuilder.cs" />
@@ -88,8 +88,8 @@
     <Compile Include="ContentValueSetValidator.cs" />
     <Compile Include="UmbracoExamineIndexDiagnostics.cs" />
     <Compile Include="UmbracoExamineIndex.cs" />
-    <Compile Include="UmbracoExamineSearcher.cs" />
     <Compile Include="LuceneIndexCreator.cs" />
+    <Compile Include="UmbracoFieldDefinitionCollection.cs" />
     <Compile Include="UmbracoMemberIndex.cs" />
     <Compile Include="..\SolutionInfo.cs">
       <Link>Properties\SolutionInfo.cs</Link>
diff --git a/src/Umbraco.Examine/UmbracoContentIndex.cs b/src/Umbraco.Examine/UmbracoContentIndex.cs
index 822117de46..e16015e192 100644
--- a/src/Umbraco.Examine/UmbracoContentIndex.cs
+++ b/src/Umbraco.Examine/UmbracoContentIndex.cs
@@ -52,13 +52,13 @@ namespace Umbraco.Examine
         /// <param name="indexValueTypes"></param>
         public UmbracoContentIndex(
             string name,
-            IEnumerable<FieldDefinition> fieldDefinitions,
+            FieldDefinitionCollection fieldDefinitions,
             Directory luceneDirectory,
             Analyzer defaultAnalyzer,
             IProfilingLogger profilingLogger,
             ILocalizationService languageService,
             IContentValueSetValidator validator,
-            IReadOnlyDictionary<string, Func<string, IIndexValueType>> indexValueTypes = null)
+            IReadOnlyDictionary<string, IFieldValueTypeFactory> indexValueTypes = null)
             : base(name, fieldDefinitions, luceneDirectory, defaultAnalyzer, profilingLogger, validator, indexValueTypes)
         {
             if (validator == null) throw new ArgumentNullException(nameof(validator));
@@ -122,7 +122,7 @@ namespace Umbraco.Examine
                 //anywhere else in this class
                 Current.Services.PublicAccessService,
                 parentId,
-                ConfigIndexCriteria.IncludeItemTypes, ConfigIndexCriteria.ExcludeItemTypes);
+                ConfigIndexCriteria?.IncludeItemTypes, ConfigIndexCriteria?.ExcludeItemTypes);
 
             PublishedValuesOnly = supportUnpublished;
         }
@@ -200,41 +200,17 @@ namespace Umbraco.Examine
             var descendantPath = $@"\-1\,*{nodeId}\,*";
             var rawQuery = $"{IndexPathFieldName}:{descendantPath}";
             var searcher = GetSearcher();
-            var c = searcher.CreateCriteria();
-            var filtered = c.RawQuery(rawQuery);
-            var results = searcher.Search(filtered);
+            var c = searcher.CreateQuery();
+            var filtered = c.NativeQuery(rawQuery);
+            var results = filtered.Execute();
 
             ProfilingLogger.Debug(GetType(), "DeleteFromIndex with query: {Query} (found {TotalItems} results)", rawQuery, results.TotalItemCount);
 
             //need to queue a delete item for each one found
-            foreach (var r in results)
-            {
-                QueueIndexOperation(new IndexOperation(new ValueSet(r.Id), IndexOperationType.Delete));
-            }
+            QueueIndexOperation(results.Select(r => new IndexOperation(new ValueSet(r.Id), IndexOperationType.Delete)));
 
             base.PerformDeleteFromIndex(nodeId, onComplete);
         }
-
-        /// <summary>
-        /// Overridden to ensure that the variant system fields have the right value types
-        /// </summary>
-        /// <param name="x"></param>
-        /// <param name="indexValueTypesFactory"></param>
-        /// <returns></returns>
-        protected override FieldValueTypeCollection CreateFieldValueTypes(IReadOnlyDictionary<string, Func<string, IIndexValueType>> indexValueTypesFactory = null)
-        {
-            //fixme: languages are dynamic so although this will work on startup it wont work when languages are edited
-            foreach(var lang in LanguageService.GetAllLanguages())
-            {
-                foreach (var field in UmbracoIndexFieldDefinitions)
-                {
-                    var def = new FieldDefinition($"{field.Name}_{lang.IsoCode.ToLowerInvariant()}", field.Type);
-                    FieldDefinitionCollection.TryAdd(def.Name, def);
-                }
-            }
-
-            return base.CreateFieldValueTypes(indexValueTypesFactory);
-        }
         
     }
 }
diff --git a/src/Umbraco.Examine/UmbracoExamineExtensions.cs b/src/Umbraco.Examine/UmbracoExamineExtensions.cs
index 8be5a6c1e3..f33b7587e0 100644
--- a/src/Umbraco.Examine/UmbracoExamineExtensions.cs
+++ b/src/Umbraco.Examine/UmbracoExamineExtensions.cs
@@ -1,10 +1,6 @@
-using System;
-using System.ComponentModel;
-using System.Web;
-using Examine.LuceneEngine.SearchCriteria;
-using Examine.SearchCriteria;
+using Examine.LuceneEngine.Search;
+using Examine.Search;
 using Umbraco.Core;
-using Umbraco.Examine.Config;
 
 namespace Umbraco.Examine
 {
diff --git a/src/Umbraco.Examine/UmbracoExamineIndex.cs b/src/Umbraco.Examine/UmbracoExamineIndex.cs
index 591ca1c3c8..47712ee755 100644
--- a/src/Umbraco.Examine/UmbracoExamineIndex.cs
+++ b/src/Umbraco.Examine/UmbracoExamineIndex.cs
@@ -20,10 +20,9 @@ namespace Umbraco.Examine
 {
 
     /// <summary>
-    /// An abstract provider containing the basic functionality to be able to query against
-    /// Umbraco data.
+    /// An abstract provider containing the basic functionality to be able to query against Umbraco data.
     /// </summary>
-    public abstract class UmbracoExamineIndex : LuceneIndex, IUmbracoIndexer, IIndexDiagnostics
+    public abstract class UmbracoExamineIndex : LuceneIndex, IUmbracoIndex, IIndexDiagnostics
     {
         // note
         // wrapping all operations that end up calling base.SafelyProcessQueueItems in a safe call
@@ -53,6 +52,7 @@ namespace Umbraco.Examine
         {
             ProfilingLogger = Current.ProfilingLogger;
             _configBased = true;
+            _diagnostics = new UmbracoExamineIndexDiagnostics(this, ProfilingLogger.Logger);
         }
 
         /// <summary>
@@ -67,12 +67,12 @@ namespace Umbraco.Examine
         /// <param name="indexValueTypes"></param>
         protected UmbracoExamineIndex(
             string name,
-            IEnumerable<FieldDefinition> fieldDefinitions,
+            FieldDefinitionCollection fieldDefinitions,
             Directory luceneDirectory,
             Analyzer defaultAnalyzer,
             IProfilingLogger profilingLogger,
             IValueSetValidator validator = null,
-            IReadOnlyDictionary<string, Func<string, IIndexValueType>> indexValueTypes = null)
+            IReadOnlyDictionary<string, IFieldValueTypeFactory> indexValueTypes = null)
             : base(name, fieldDefinitions, luceneDirectory, defaultAnalyzer, validator, indexValueTypes)
         {
             ProfilingLogger = profilingLogger ?? throw new ArgumentNullException(nameof(profilingLogger));
@@ -86,60 +86,8 @@ namespace Umbraco.Examine
 
         private readonly bool _configBased = false;
 
-        /// <summary>
-        /// A type that defines the type of index for each Umbraco field (non user defined fields)
-        /// Alot of standard umbraco fields shouldn't be tokenized or even indexed, just stored into lucene
-        /// for retreival after searching.
-        /// </summary>
-        public static readonly FieldDefinition[] UmbracoIndexFieldDefinitions =
-        {
-            new FieldDefinition("parentID", FieldDefinitionTypes.Integer),
-            new FieldDefinition("level", FieldDefinitionTypes.Integer),
-            new FieldDefinition("writerID", FieldDefinitionTypes.Integer),
-            new FieldDefinition("creatorID", FieldDefinitionTypes.Integer),
-            new FieldDefinition("sortOrder", FieldDefinitionTypes.Integer),
-            new FieldDefinition("template", FieldDefinitionTypes.Integer),
-
-            new FieldDefinition("createDate", FieldDefinitionTypes.DateTime),
-            new FieldDefinition("updateDate", FieldDefinitionTypes.DateTime),
-
-            new FieldDefinition("key", FieldDefinitionTypes.InvariantCultureIgnoreCase),
-            new FieldDefinition("version", FieldDefinitionTypes.Raw),
-            new FieldDefinition("nodeType", FieldDefinitionTypes.InvariantCultureIgnoreCase),
-            new FieldDefinition("template", FieldDefinitionTypes.Raw),
-            new FieldDefinition("urlName", FieldDefinitionTypes.InvariantCultureIgnoreCase),
-            new FieldDefinition("path", FieldDefinitionTypes.Raw),
-
-            new FieldDefinition("email", FieldDefinitionTypes.EmailAddress),
-
-            new FieldDefinition(PublishedFieldName, FieldDefinitionTypes.Raw),
-            new FieldDefinition(NodeKeyFieldName, FieldDefinitionTypes.Raw),
-            new FieldDefinition(IndexPathFieldName, FieldDefinitionTypes.Raw),
-            new FieldDefinition(IconFieldName, FieldDefinitionTypes.Raw)
-        };
-
         protected IProfilingLogger ProfilingLogger { get; }
 
-        /// <summary>
-        /// Overridden to ensure that the umbraco system field definitions are in place
-        /// </summary>
-        /// <param name="indexValueTypesFactory"></param>
-        /// <returns></returns>
-        protected override FieldValueTypeCollection CreateFieldValueTypes(IReadOnlyDictionary<string, Func<string, IIndexValueType>> indexValueTypesFactory = null)
-        {
-            //if config based then ensure the value types else it's assumed these were passed in via ctor
-            if (_configBased)
-            {
-                foreach (var field in UmbracoIndexFieldDefinitions)
-                {
-                    FieldDefinitionCollection.TryAdd(field.Name, field);
-                }
-            }
-
-
-            return base.CreateFieldValueTypes(indexValueTypesFactory);
-        }
-
         /// <summary>
         /// When set to true Umbraco will keep the index in sync with Umbraco data automatically
         /// </summary>
@@ -147,6 +95,14 @@ namespace Umbraco.Examine
 
         public bool PublishedValuesOnly { get; protected set; } = false;
 
+        /// <inheritdoc />
+        public IEnumerable<string> GetFields()
+        {
+            //we know this is a LuceneSearcher
+            var searcher = (LuceneSearcher) GetSearcher();
+            return searcher.GetAllIndexedFields();
+        }
+
         protected ConfigIndexCriteria ConfigIndexCriteria { get; private set; }
 
         /// <summary>
@@ -174,12 +130,15 @@ namespace Umbraco.Examine
                 EnableDefaultEventHandler = enabled;
             }
 
-            //Need to check if the index set or IndexerData is specified...
-            if (config["indexSet"] == null && FieldDefinitionCollection.Count == 0)
+            //this is config based, so add the default definitions
+            foreach (var field in UmbracoFieldDefinitionCollection.UmbracoIndexFieldDefinitions)
             {
-                //if we don't have either, then we'll try to set the index set by naming conventions
-                var found = false;
+                FieldDefinitionCollection.TryAdd(field);
+            }
 
+            //Need to check if the index set is specified...
+            if (config["indexSet"] == null)
+            {
                 var possibleSuffixes = new[] {"Index", "Indexer"};
                 foreach (var suffix in possibleSuffixes)
                 {
@@ -200,36 +159,29 @@ namespace Umbraco.Examine
                     ConfigIndexCriteria = CreateFieldDefinitionsFromConfig(indexSet);
                     foreach (var fieldDefinition in ConfigIndexCriteria.StandardFields.Union(ConfigIndexCriteria.UserFields))
                     {
-                        FieldDefinitionCollection.TryAdd(fieldDefinition.Name, fieldDefinition);
+                        //replace any existing or add
+                        FieldDefinitionCollection.AddOrUpdate(fieldDefinition);
                     }
-                    found = true;
                     break;
                 }
-
-                if (!found)
-                    throw new ArgumentNullException("indexSet on LuceneExamineIndexer provider has not been set in configuration and/or the IndexerData property has not been explicitly set");
-
             }
-            else if (config["indexSet"] != null)
+            else
             {
                 //if an index set is specified, ensure it exists and initialize the indexer based on the set
 
                 if (IndexSets.Instance.Sets[config["indexSet"]] == null)
-                {
                     throw new ArgumentException("The indexSet specified for the LuceneExamineIndexer provider does not exist");
-                }
-                else
+
+                IndexSetName = config["indexSet"];
+
+                var indexSet = IndexSets.Instance.Sets[IndexSetName];
+
+                //get the index criteria and ensure folder
+                ConfigIndexCriteria = CreateFieldDefinitionsFromConfig(indexSet);
+                foreach (var fieldDefinition in ConfigIndexCriteria.StandardFields.Union(ConfigIndexCriteria.UserFields))
                 {
-                    IndexSetName = config["indexSet"];
-
-                    var indexSet = IndexSets.Instance.Sets[IndexSetName];
-
-                    //get the index criteria and ensure folder
-                    ConfigIndexCriteria = CreateFieldDefinitionsFromConfig(indexSet);
-                    foreach (var fieldDefinition in ConfigIndexCriteria.StandardFields.Union(ConfigIndexCriteria.UserFields))
-                    {
-                        FieldDefinitionCollection.TryAdd(fieldDefinition.Name, fieldDefinition);
-                    }
+                    //replace any existing or add
+                    FieldDefinitionCollection.AddOrUpdate(fieldDefinition);
                 }
             }
 
diff --git a/src/Umbraco.Examine/UmbracoExamineSearcher.cs b/src/Umbraco.Examine/UmbracoExamineSearcher.cs
deleted file mode 100644
index 50c6c21e37..0000000000
--- a/src/Umbraco.Examine/UmbracoExamineSearcher.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-//using System;
-//using System.ComponentModel;
-//using System.IO;
-//using System.Linq;
-//using Umbraco.Core;
-//using Examine.LuceneEngine.Providers;
-//using Lucene.Net.Analysis;
-//using Lucene.Net.Index;
-//using Umbraco.Core.Composing;
-//using Umbraco.Examine.Config;
-//using Directory = Lucene.Net.Store.Directory;
-//using Examine.LuceneEngine;
-
-//namespace Umbraco.Examine
-//{
-//    /// <summary>
-//    /// An Examine searcher which uses Lucene.Net as the
-//    /// </summary>
-//    public class UmbracoExamineSearcher : LuceneSearcher
-//    {
-//        /// <summary>
-//        /// Constructor to allow for creating an indexer at runtime
-//        /// </summary>
-//        /// <param name="name"></param>
-//        /// <param name="luceneDirectory"></param>
-//        /// <param name="analyzer"></param>
-//        public UmbracoExamineSearcher(string name, Directory luceneDirectory, Analyzer analyzer, FieldValueTypeCollection fieldValueTypeCollection)
-//            : base(name, luceneDirectory, analyzer, fieldValueTypeCollection)
-//        {
-//        }
-
-//        /// <inheritdoc />
-//        public UmbracoExamineSearcher(string name, IndexWriter writer, Analyzer analyzer, FieldValueTypeCollection fieldValueTypeCollection)
-//            : base(name, writer, analyzer, fieldValueTypeCollection)
-//        {
-//        }
-
-//        /// <summary>
-//        /// Returns a list of fields to search on, this will also exclude the IndexPathFieldName and node type alias
-//        /// </summary>
-//        /// <returns></returns>
-//        public override string[] GetAllIndexedFields()
-//        {
-//            var fields = base.GetAllIndexedFields();
-//            return fields
-//                .Where(x => x != UmbracoExamineIndexer.IndexPathFieldName)
-//                .Where(x => x != LuceneIndex.ItemTypeFieldName)
-//                .ToArray();
-//        }
-
-//    }
-//}
diff --git a/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs b/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs
new file mode 100644
index 0000000000..97d1f68727
--- /dev/null
+++ b/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs
@@ -0,0 +1,75 @@
+using Examine;
+
+namespace Umbraco.Examine
+{
+    /// <summary>
+    /// Custom <see cref="FieldDefinitionCollection"/> allowing dynamic creation of <see cref="FieldDefinition"/>
+    /// </summary>
+    public class UmbracoFieldDefinitionCollection : FieldDefinitionCollection
+    {
+        
+        public UmbracoFieldDefinitionCollection()
+            : base(UmbracoIndexFieldDefinitions)
+        {
+        }
+
+        /// <summary>
+        /// A type that defines the type of index for each Umbraco field (non user defined fields)
+        /// Alot of standard umbraco fields shouldn't be tokenized or even indexed, just stored into lucene
+        /// for retreival after searching.
+        /// </summary>
+        public static readonly FieldDefinition[] UmbracoIndexFieldDefinitions =
+        {
+            new FieldDefinition("parentID", FieldDefinitionTypes.Integer),
+            new FieldDefinition("level", FieldDefinitionTypes.Integer),
+            new FieldDefinition("writerID", FieldDefinitionTypes.Integer),
+            new FieldDefinition("creatorID", FieldDefinitionTypes.Integer),
+            new FieldDefinition("sortOrder", FieldDefinitionTypes.Integer),
+            new FieldDefinition("template", FieldDefinitionTypes.Integer),
+
+            new FieldDefinition("createDate", FieldDefinitionTypes.DateTime),
+            new FieldDefinition("updateDate", FieldDefinitionTypes.DateTime),
+
+            new FieldDefinition("key", FieldDefinitionTypes.InvariantCultureIgnoreCase),
+            new FieldDefinition("version", FieldDefinitionTypes.Raw),
+            new FieldDefinition("nodeType", FieldDefinitionTypes.InvariantCultureIgnoreCase),
+            new FieldDefinition("template", FieldDefinitionTypes.Raw),
+            new FieldDefinition("urlName", FieldDefinitionTypes.InvariantCultureIgnoreCase),
+            new FieldDefinition("path", FieldDefinitionTypes.Raw),
+
+            new FieldDefinition("email", FieldDefinitionTypes.EmailAddress),
+
+            new FieldDefinition(UmbracoExamineIndex.PublishedFieldName, FieldDefinitionTypes.Raw),
+            new FieldDefinition(UmbracoExamineIndex.NodeKeyFieldName, FieldDefinitionTypes.Raw),
+            new FieldDefinition(UmbracoExamineIndex.IndexPathFieldName, FieldDefinitionTypes.Raw),
+            new FieldDefinition(UmbracoExamineIndex.IconFieldName, FieldDefinitionTypes.Raw)
+        };
+
+        ///// <summary>
+        ///// Overridden to dynamically add field definitions for culture variations
+        ///// </summary>
+        ///// <param name="fieldName"></param>
+        ///// <param name="fieldDefinition"></param>
+        ///// <returns></returns>
+        //public override bool TryGetValue(string fieldName, out FieldDefinition fieldDefinition)
+        //{
+        //    var result = base.TryGetValue(fieldName, out fieldDefinition);
+        //    if (result) return true;
+
+        //    //if the fieldName is not suffixed with _iso-Code
+        //    var underscoreIndex = fieldName.LastIndexOf('_');
+        //    if (underscoreIndex == -1) return false;
+
+
+
+        //    var isoCode = fieldName.Substring(underscoreIndex);
+        //    if (isoCode.Length < 6) return false; //invalid isoCode
+
+        //    var hyphenIndex = isoCode.IndexOf('-');
+        //    if (hyphenIndex != 3) return false; //invalid isoCode
+
+        //    //we'll assume this is a valid isoCode
+
+        //}
+    }
+}
diff --git a/src/Umbraco.Examine/UmbracoMemberIndex.cs b/src/Umbraco.Examine/UmbracoMemberIndex.cs
index 451bfbbcb7..fae818a4a5 100644
--- a/src/Umbraco.Examine/UmbracoMemberIndex.cs
+++ b/src/Umbraco.Examine/UmbracoMemberIndex.cs
@@ -42,8 +42,8 @@ namespace Umbraco.Examine
         /// <param name="validator"></param>
         /// <param name="analyzer"></param>
         public UmbracoMemberIndex(
-            string name, 
-            IEnumerable<FieldDefinition> fieldDefinitions,
+            string name,
+            FieldDefinitionCollection fieldDefinitions,
             Directory luceneDirectory,
             Analyzer analyzer,
             IProfilingLogger profilingLogger,
@@ -64,10 +64,10 @@ namespace Umbraco.Examine
         /// </summary>
         /// <param name="indexValueTypesFactory"></param>
         /// <returns></returns>
-        protected override FieldValueTypeCollection CreateFieldValueTypes(IReadOnlyDictionary<string, Func<string, IIndexValueType>> indexValueTypesFactory = null)
+        protected override FieldValueTypeCollection CreateFieldValueTypes(IReadOnlyDictionary<string, IFieldValueTypeFactory> indexValueTypesFactory = null)
         {
             var keyDef = new FieldDefinition("__key", FieldDefinitionTypes.Raw);
-            FieldDefinitionCollection.TryAdd(keyDef.Name, keyDef);
+            FieldDefinitionCollection.TryAdd(keyDef);
 
             return base.CreateFieldValueTypes(indexValueTypesFactory);
         }
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
index c736b47e53..d88df766e3 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
@@ -171,9 +171,9 @@ namespace Umbraco.Tests.PublishedContent
 
 
                 //ensure it still exists in the index (raw examine search)
-                var criteria = searcher.CreateCriteria();
+                var criteria = searcher.CreateQuery();
                 var filter = criteria.Id(3113);
-                var found = searcher.Search(filter.Compile());
+                var found = filter.Execute();
                 Assert.IsNotNull(found);
                 Assert.AreEqual(1, found.TotalItemCount);
 
diff --git a/src/Umbraco.Tests/Services/EntityServiceTests.cs b/src/Umbraco.Tests/Services/EntityServiceTests.cs
index 1db653f4ab..2425f8b74a 100644
--- a/src/Umbraco.Tests/Services/EntityServiceTests.cs
+++ b/src/Umbraco.Tests/Services/EntityServiceTests.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Services;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
@@ -37,6 +38,53 @@ namespace Umbraco.Tests.Services
             }
         }
 
+        [Test]
+        public void EntityService_Can_Get_Paged_Descendants_Ordering_Path()
+        {
+
+            var contentType = ServiceContext.ContentTypeService.Get("umbTextpage");
+
+            var root = MockedContent.CreateSimpleContent(contentType);
+            ServiceContext.ContentService.Save(root);
+            var rootId = root.Id;
+            var ids = new List<int>();
+            for (int i = 0; i < 10; i++)
+            {
+                var c1 = MockedContent.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), root);
+                ServiceContext.ContentService.Save(c1);
+                ids.Add(c1.Id);
+                root = c1; // make a hierarchy
+            }
+
+            var service = ServiceContext.EntityService;
+
+            long total;
+
+            var entities = service.GetPagedDescendants(rootId, UmbracoObjectTypes.Document, 0, 6, out total).ToArray();
+            Assert.That(entities.Length, Is.EqualTo(6));
+            Assert.That(total, Is.EqualTo(10));
+            Assert.AreEqual(ids[0], entities[0].Id);
+
+            entities = service.GetPagedDescendants(rootId, UmbracoObjectTypes.Document, 1, 6, out total).ToArray();
+            Assert.That(entities.Length, Is.EqualTo(4));
+            Assert.That(total, Is.EqualTo(10));
+            Assert.AreEqual(ids[6], entities[0].Id);
+
+            //Test ordering direction
+
+            entities = service.GetPagedDescendants(rootId, UmbracoObjectTypes.Document, 0, 6, out total,
+                ordering: Ordering.By("Path", Direction.Descending)).ToArray();
+            Assert.That(entities.Length, Is.EqualTo(6));
+            Assert.That(total, Is.EqualTo(10));
+            Assert.AreEqual(ids[ids.Count - 1], entities[0].Id);
+
+            entities = service.GetPagedDescendants(rootId, UmbracoObjectTypes.Document, 1, 6, out total,
+                ordering: Ordering.By("Path", Direction.Descending)).ToArray();
+            Assert.That(entities.Length, Is.EqualTo(4));
+            Assert.That(total, Is.EqualTo(10));
+            Assert.AreEqual(ids[ids.Count - 1 - 6], entities[0].Id);
+        }
+
         [Test]
         public void EntityService_Can_Get_Paged_Content_Children()
         {
@@ -45,21 +93,41 @@ namespace Umbraco.Tests.Services
 
             var root = MockedContent.CreateSimpleContent(contentType);
             ServiceContext.ContentService.Save(root);
+            var ids = new List<int>();
             for (int i = 0; i < 10; i++)
             {
                 var c1 = MockedContent.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), root);
                 ServiceContext.ContentService.Save(c1);
+                ids.Add(c1.Id);
             }
 
             var service = ServiceContext.EntityService;
 
             long total;
+
             var entities = service.GetPagedChildren(root.Id, UmbracoObjectTypes.Document, 0, 6, out total).ToArray();
             Assert.That(entities.Length, Is.EqualTo(6));
             Assert.That(total, Is.EqualTo(10));
+            Assert.AreEqual(ids[0], entities[0].Id);
+
             entities = service.GetPagedChildren(root.Id, UmbracoObjectTypes.Document, 1, 6, out total).ToArray();
             Assert.That(entities.Length, Is.EqualTo(4));
             Assert.That(total, Is.EqualTo(10));
+            Assert.AreEqual(ids[6], entities[0].Id);
+
+            //Test ordering direction
+
+            entities = service.GetPagedChildren(root.Id, UmbracoObjectTypes.Document, 0, 6, out total,
+                ordering: Ordering.By("SortOrder", Direction.Descending)).ToArray();
+            Assert.That(entities.Length, Is.EqualTo(6));
+            Assert.That(total, Is.EqualTo(10));
+            Assert.AreEqual(ids[ids.Count - 1], entities[0].Id);
+
+            entities = service.GetPagedChildren(root.Id, UmbracoObjectTypes.Document, 1, 6, out total,
+                ordering: Ordering.By("SortOrder", Direction.Descending)).ToArray();
+            Assert.That(entities.Length, Is.EqualTo(4));
+            Assert.That(total, Is.EqualTo(10));
+            Assert.AreEqual(ids[ids.Count - 1 - 6], entities[0].Id);
         }
 
         [Test]
@@ -206,10 +274,12 @@ namespace Umbraco.Tests.Services
             var service = ServiceContext.EntityService;
 
             long total;
-            var entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Document, 0, 10, out total, filter: "ssss").ToArray();
+            var entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Document, 0, 10, out total,
+                filter: SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains("ssss"))).ToArray();
             Assert.That(entities.Length, Is.EqualTo(10));
             Assert.That(total, Is.EqualTo(10));
-            entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Document, 0, 50, out total, filter: "tttt").ToArray();
+            entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Document, 0, 50, out total,
+                filter: SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains("tttt"))).ToArray();
             Assert.That(entities.Length, Is.EqualTo(50));
             Assert.That(total, Is.EqualTo(50));
         }
@@ -389,10 +459,12 @@ namespace Umbraco.Tests.Services
             var service = ServiceContext.EntityService;
 
             long total;
-            var entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Media, 0, 10, out total, filter: "ssss").ToArray();
+            var entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Media, 0, 10, out total,
+                filter: SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains("ssss"))).ToArray();
             Assert.That(entities.Length, Is.EqualTo(10));
             Assert.That(total, Is.EqualTo(10));
-            entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Media, 0, 50, out total, filter: "tttt").ToArray();
+            entities = service.GetPagedDescendants(root.Id, UmbracoObjectTypes.Media, 0, 50, out total,
+                filter: SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains("tttt"))).ToArray();
             Assert.That(entities.Length, Is.EqualTo(50));
             Assert.That(total, Is.EqualTo(50));
         }
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 99d67c31e2..ea8f1fd13c 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -77,7 +77,7 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="7.0.1" />
     <PackageReference Include="Castle.Core" Version="4.2.1" />
-    <PackageReference Include="Examine" Version="1.0.0-beta046" />
+    <PackageReference Include="Examine" Version="1.0.0-beta067" />
     <PackageReference Include="HtmlAgilityPack">
       <Version>1.8.9</Version>
     </PackageReference>
diff --git a/src/Umbraco.Tests/UmbracoExamine/EventsTest.cs b/src/Umbraco.Tests/UmbracoExamine/EventsTest.cs
index 47fa32cbaa..ed5ae07fc0 100644
--- a/src/Umbraco.Tests/UmbracoExamine/EventsTest.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/EventsTest.cs
@@ -36,7 +36,7 @@ namespace Umbraco.Tests.UmbracoExamine
                 var valueSet = node.ConvertToValueSet(IndexTypes.Content);
                 indexer.IndexItems(new[] { valueSet });
 
-                var found = searcher.Search(searcher.CreateCriteria().Id((string)node.Attribute("id")).Compile());
+                var found = searcher.CreateQuery().Id((string)node.Attribute("id")).Execute();
 
                 Assert.AreEqual(0, found.TotalItemCount);
             }
diff --git a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
index 09ad340e2b..fbbf2042ca 100644
--- a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
@@ -164,7 +164,7 @@ namespace Umbraco.Tests.UmbracoExamine
 
             var i = new UmbracoContentIndex(
                 "testIndexer",
-                UmbracoExamineIndex.UmbracoIndexFieldDefinitions,
+                new UmbracoFieldDefinitionCollection(), 
                 luceneDir,
                 analyzer,
                 profilingLogger,
diff --git a/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs b/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs
index f45761dd54..ba6a83adff 100644
--- a/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs
@@ -103,7 +103,7 @@ namespace Umbraco.Tests.UmbracoExamine
 
                 var searcher = indexer.GetSearcher();
 
-                var results = searcher.Search(searcher.CreateCriteria().Id(555).Compile());
+                var results = searcher.CreateQuery().Id(555).Execute();
                 Assert.AreEqual(1, results.TotalItemCount);
 
                 var result = results.First();
@@ -128,8 +128,6 @@ namespace Umbraco.Tests.UmbracoExamine
                 validator: new ContentValueSetValidator(false)))
             using (indexer.ProcessNonAsync())
             {
-                contentRebuilder.RegisterIndex(indexer.Name);
-                mediaRebuilder.RegisterIndex(indexer.Name);
 
                 var searcher = indexer.GetSearcher();
 
@@ -137,7 +135,7 @@ namespace Umbraco.Tests.UmbracoExamine
                 contentRebuilder.Populate(indexer);
                 mediaRebuilder.Populate(indexer);
 
-                var result = searcher.Search(searcher.CreateCriteria().All().Compile());
+                var result = searcher.CreateQuery().All().Execute();
 
                 Assert.AreEqual(29, result.TotalItemCount);
             }
@@ -208,7 +206,7 @@ namespace Umbraco.Tests.UmbracoExamine
                 indexer.IndexItem(node.ConvertToValueSet(IndexTypes.Media));
 
                 //it will not exist because it exists under 2222
-                var results = searcher.Search(searcher.CreateCriteria().Id(2112).Compile());
+                var results = searcher.CreateQuery().Id(2112).Execute();
                 Assert.AreEqual(0, results.Count());
 
                 //now mimic moving 2112 to 1116
@@ -220,7 +218,7 @@ namespace Umbraco.Tests.UmbracoExamine
                 indexer.IndexItems(new[] { node.ConvertToValueSet(IndexTypes.Media) });
 
                 //now ensure it exists
-                results = searcher.Search(searcher.CreateCriteria().Id(2112).Compile());
+                results = searcher.CreateQuery().Id(2112).Execute();
                 Assert.AreEqual(1, results.Count());
             }
         }
@@ -251,7 +249,7 @@ namespace Umbraco.Tests.UmbracoExamine
                 indexer1.IndexItem(node.ConvertToValueSet(IndexTypes.Media));
 
                 //it will exist because it exists under 2222
-                var results = searcher.Search(searcher.CreateCriteria().Id(2112).Compile());
+                var results = searcher.CreateQuery().Id(2112).Execute();
                 Assert.AreEqual(1, results.Count());
 
                 //now mimic moving the node underneath 1116 instead of 2222
@@ -262,7 +260,7 @@ namespace Umbraco.Tests.UmbracoExamine
                 indexer1.IndexItems(new[] { node.ConvertToValueSet(IndexTypes.Media) });
 
                 //now ensure it's deleted
-                results = searcher.Search(searcher.CreateCriteria().Id(2112).Compile());
+                results = searcher.CreateQuery().Id(2112).Execute();
                 Assert.AreEqual(0, results.Count());
             }
         }
@@ -281,14 +279,13 @@ namespace Umbraco.Tests.UmbracoExamine
                 validator: new ContentValueSetValidator(false)))
             using (indexer.ProcessNonAsync())
             {
-                rebuilder.RegisterIndex(indexer.Name);
 
                 var searcher = indexer.GetSearcher();
 
                 //create the whole thing
                 rebuilder.Populate(indexer);
 
-                var result = searcher.Search(searcher.CreateCriteria().Field(LuceneIndex.CategoryFieldName, IndexTypes.Content).Compile());
+                var result = searcher.CreateQuery().Field(LuceneIndex.CategoryFieldName, IndexTypes.Content).Execute();
                 Assert.AreEqual(21, result.TotalItemCount);
 
                 //delete all content
@@ -299,13 +296,13 @@ namespace Umbraco.Tests.UmbracoExamine
 
 
                 //ensure it's all gone
-                result = searcher.Search(searcher.CreateCriteria().Field(LuceneIndex.CategoryFieldName, IndexTypes.Content).Compile());
+                result = searcher.CreateQuery().Field(LuceneIndex.CategoryFieldName, IndexTypes.Content).Execute();
                 Assert.AreEqual(0, result.TotalItemCount);
 
                 //call our indexing methods
                 rebuilder.Populate(indexer);
 
-                result = searcher.Search(searcher.CreateCriteria().Field(LuceneIndex.CategoryFieldName, IndexTypes.Content).Compile());
+                result = searcher.CreateQuery().Field(LuceneIndex.CategoryFieldName, IndexTypes.Content).Execute();
                 Assert.AreEqual(21, result.TotalItemCount);
             }
         }
@@ -333,10 +330,10 @@ namespace Umbraco.Tests.UmbracoExamine
                 indexer.DeleteFromIndex(1140.ToString());
                 //this node had children: 1141 & 1142, let's ensure they are also removed
 
-                var results = searcher.Search(searcher.CreateCriteria().Id(1141).Compile());
+                var results = searcher.CreateQuery().Id(1141).Execute();
                 Assert.AreEqual(0, results.Count());
 
-                results = searcher.Search(searcher.CreateCriteria().Id(1142).Compile());
+                results = searcher.CreateQuery().Id(1142).Execute();
                 Assert.AreEqual(0, results.Count());
 
             }
diff --git a/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs b/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs
index fbfb2f90c0..7aa36f16e3 100644
--- a/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs
@@ -2,16 +2,16 @@
 using System.Collections.Generic;
 using System.Linq;
 using Examine;
+using Examine.Search;
 using NUnit.Framework;
-using Examine.LuceneEngine.SearchCriteria;
 using Moq;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Services;
-using Umbraco.Examine;
 using Umbraco.Tests.Testing;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Composing;
+using Umbraco.Examine;
 
 namespace Umbraco.Tests.UmbracoExamine
 {
@@ -60,21 +60,20 @@ namespace Umbraco.Tests.UmbracoExamine
             using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, luceneDir))
             using (indexer.ProcessNonAsync())
             {
-                rebuilder.RegisterIndex(indexer.Name);
                 indexer.CreateIndex();
                 rebuilder.Populate(indexer);
 
                 var searcher = indexer.GetSearcher();
 
-                var numberSortedCriteria = searcher.CreateCriteria()
-                    .ParentId(1148).And()
+                var numberSortedCriteria = searcher.CreateQuery()
+                    .ParentId(1148)
                     .OrderBy(new SortableField("sortOrder", SortType.Int));
-                var numberSortedResult = searcher.Search(numberSortedCriteria.Compile());
+                var numberSortedResult = numberSortedCriteria.Execute();
 
-                var stringSortedCriteria = searcher.CreateCriteria()
-                    .ParentId(1148).And()
-                    .OrderBy("sortOrder"); //will default to string
-                var stringSortedResult = searcher.Search(stringSortedCriteria.Compile());
+                var stringSortedCriteria = searcher.CreateQuery()
+                    .ParentId(1148)
+                    .OrderBy(new SortableField("sortOrder"));//will default to string
+                var stringSortedResult = stringSortedCriteria.Execute();
 
                 Assert.AreEqual(12, numberSortedResult.TotalItemCount);
                 Assert.AreEqual(12, stringSortedResult.TotalItemCount);
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
index deb9f4c1ac..f01083d725 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
@@ -262,7 +262,7 @@ Use this directive to construct a header inside the main editor window.
                 icon: "=",
                 hideIcon: "@",
                 alias: "=",
-                hideAlias: "@",
+                hideAlias: "=",
                 description: "=",
                 hideDescription: "@",
                 descriptionLocked: "@",
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
index 23f3fb6d58..ecc92263bc 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
@@ -30,12 +30,6 @@ function navigationService($routeParams, $location, $q, $timeout, $injector, eve
     var nonRoutingQueryStrings = ["mculture", "cculture"];
     var retainedQueryStrings = ['mculture'];
 
-    //used to track the current dialog object
-    var currentDialog = null;
-        
-    //tracks the user profile dialog
-    var userDialog = null;
-
     function setMode(mode) {
         switch (mode) {
         case 'tree':
@@ -287,7 +281,7 @@ function navigationService($routeParams, $location, $q, $timeout, $injector, eve
             appState.setGlobalState("showTray", false);
         },
 
-        /**
+        /**     
          * @ngdoc method
          * @name umbraco.services.navigationService#syncTree
          * @methodOf umbraco.services.navigationService
diff --git a/src/Umbraco.Web.UI.Client/src/less/healthcheck.less b/src/Umbraco.Web.UI.Client/src/less/healthcheck.less
index d40b59cf81..9e1362d50a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/healthcheck.less
+++ b/src/Umbraco.Web.UI.Client/src/less/healthcheck.less
@@ -242,4 +242,5 @@
 .umb-healthcheck-group__details-status-action-description {
 	margin-top: 5px;
 	font-size: 12px;
+    padding-left: 165px;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js
index 54d5da29a8..75bf414099 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js
@@ -1,7 +1,7 @@
- (function() {
-	"use strict";
+(function () {
+    "use strict";
 
-	function CompositionsController($scope,$location) {
+    function CompositionsController($scope, $location, $filter) {
 
         var vm = this;
         var oldModel = null;
@@ -19,18 +19,34 @@
             back the changes on cancel */
             oldModel = angular.copy($scope.model);
 
-            if(!$scope.model.title) {
+            if (!$scope.model.title) {
                 $scope.model.title = "Compositions";
             }
 
+            // group the content types by their container paths
+            vm.availableGroups = $filter("orderBy")(
+                _.map(
+                    _.groupBy($scope.model.availableCompositeContentTypes, function (compositeContentType) {
+                        return compositeContentType.contentType.metaData.containerPath;
+                    }), function (group) {
+                        return {
+                            containerPath: group[0].contentType.metaData.containerPath,
+                            compositeContentTypes: group
+                        };
+                    }
+                ), function (group) {
+                    return group.containerPath.replace(/\//g, " ");
+                });
         }
 
+        
+
         function isSelected(alias) {
-            if($scope.model.contentType.compositeContentTypes.indexOf(alias) !== -1) {
+            if ($scope.model.contentType.compositeContentTypes.indexOf(alias) !== -1) {
                 return true;
             }
         }
-        
+
         function openContentType(contentType, section) {
             var url = (section === "documentType" ? "/settings/documenttypes/edit/" : "/settings/mediaTypes/edit/") + contentType.id;
             $location.path(url);
@@ -38,19 +54,19 @@
 
         function submit() {
             if ($scope.model && $scope.model.submit) {
-                
+
                 // check if any compositions has been removed
                 vm.compositionRemoved = false;
-                for(var i = 0; oldModel.compositeContentTypes.length > i; i++) {
+                for (var i = 0; oldModel.compositeContentTypes.length > i; i++) {
                     var oldComposition = oldModel.compositeContentTypes[i];
-                    if(_.contains($scope.model.compositeContentTypes, oldComposition) === false) {
+                    if (_.contains($scope.model.compositeContentTypes, oldComposition) === false) {
                         vm.compositionRemoved = true;
                     }
                 }
 
                 /* submit the form if there havne't been removed any composition
                 or the confirm checkbox has been checked */
-                if(!vm.compositionRemoved || vm.allowSubmit) {
+                if (!vm.compositionRemoved || vm.allowSubmit) {
                     $scope.model.submit($scope.model);
                 }
             }
@@ -63,8 +79,8 @@
         }
 
         onInit();
-	}
+    }
 
-	angular.module("umbraco").controller("Umbraco.Editors.CompositionsController", CompositionsController);
+    angular.module("umbraco").controller("Umbraco.Editors.CompositionsController", CompositionsController);
 
 })();
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html
index 5d7a5420db..84fbab7cb2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html
@@ -60,29 +60,35 @@
                         </ul>
                     </div>
 
-                    <ul class="umb-checkbox-list">
-                        <li class="umb-checkbox-list__item"
-                            ng-repeat="compositeContentType in model.availableCompositeContentTypes | filter:searchTerm"
-                            ng-class="{'-disabled': compositeContentType.allowed===false || compositeContentType.inherited, '-selected': vm.isSelected(compositeContentType.contentType.alias)}">
-                
-                            <div class="umb-checkbox-list__item-checkbox"
-                                    ng-class="{ '-selected': model.compositeContentTypes.indexOf(compositeContentType.contentType.alias)+1 }">
-                                <input type="checkbox"
-                                        id="umb-overlay-comp-{{compositeContentType.contentType.key}}"
-                                        checklist-model="model.compositeContentTypes"
-                                        checklist-value="compositeContentType.contentType.alias"
-                                        ng-change="model.selectCompositeContentType(compositeContentType.contentType)"
-                                        ng-disabled="compositeContentType.allowed===false || compositeContentType.inherited" />
-                            </div>
-                
-                            <label for="umb-overlay-comp-{{compositeContentType.contentType.key}}" class="umb-checkbox-list__item-text" ng-class="{'-faded': compositeContentType.allowed===false}">
-                                <i class="{{ compositeContentType.contentType.icon }} umb-checkbox-list__item-icon"></i>
-                                {{ compositeContentType.contentType.name }}
-                                <span class="umb-checkbox-list__item-caption" ng-if="compositeContentType.inherited">(inherited)</span>
-                            </label>
-                
-                        </li>
-                    </ul>
+                    <div ng-if="vm.availableGroups.length > 0">
+                        <ul class="umb-checkbox-list" ng-repeat="group in vm.availableGroups | filter:searchTerm">
+                            <li style="font-weight: bold" ng-show="vm.availableGroups.length > 1">
+                                <i class="icon-folder umb-checkbox-list__item-icon"></i>
+                                {{group.containerPath}}
+                            </li>
+                            <li class="umb-checkbox-list__item"
+                                ng-repeat="compositeContentType in group.compositeContentTypes | orderBy:'contentType.name' | filter:searchTerm"
+                                ng-class="{'-disabled': compositeContentType.allowed===false || compositeContentType.inherited, '-selected': vm.isSelected(compositeContentType.contentType.alias)}">
+
+                                <div class="umb-checkbox-list__item-checkbox"
+                                     ng-class="{ '-selected': model.compositeContentTypes.indexOf(compositeContentType.contentType.alias)+1 }">
+                                    <input type="checkbox"
+                                           id="umb-overlay-comp-{{compositeContentType.contentType.key}}"
+                                           checklist-model="model.compositeContentTypes"
+                                           checklist-value="compositeContentType.contentType.alias"
+                                           ng-change="model.selectCompositeContentType(compositeContentType.contentType)"
+                                           ng-disabled="compositeContentType.allowed===false || compositeContentType.inherited" />
+                                </div>
+
+                                <label for="umb-overlay-comp-{{compositeContentType.contentType.key}}" class="umb-checkbox-list__item-text" ng-class="{'-faded': compositeContentType.allowed===false}">
+                                    <i class="{{ compositeContentType.contentType.icon }} umb-checkbox-list__item-icon"></i>
+                                    {{ compositeContentType.contentType.name }}
+                                    <span class="umb-checkbox-list__item-caption" ng-if="compositeContentType.inherited">(inherited)</span>
+                                </label>
+
+                            </li>
+                        </ul>
+                    </div>
 
                 </umb-box-content>
             </umb-box>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
index 7d8ce3e13e..2ce49880d7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
@@ -97,14 +97,7 @@
                     <umb-button 
                         type="button"
                         button-style="success"
-                        label="Get started"
-                        action="vm.getStarted()">
-                    </umb-button>
-                    <umb-button 
-                        ng-if="!vm.avatarFile.uploaded"
-                        type="button"
-                        button-style="link"
-                        label="Skip"
+                        label="Done"
                         action="vm.getStarted()">
                     </umb-button>
                 </div>
@@ -268,4 +261,4 @@
             </div>
         </div>
     </div>
-</div>    
\ No newline at end of file
+</div>    
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
index d4be18cf05..92e02d0d14 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
@@ -34,22 +34,25 @@ function ContentDeleteController($scope, $timeout, contentResource, treeService,
             toggleDeleting(false);
 
             if (rootNode) {
-                $timeout(function () {
-                    //ensure the recycle bin has child nodes now            
-                    var recycleBin = treeService.getDescendantNode(rootNode, -20);
-                    if (recycleBin) {
-                        //TODO: This seems to return a rejection and we end up with "Possibly unhanded rejection"
-                        treeService.syncTree({ node: recycleBin, path: treeService.getPath(recycleBin), forceReload: true });
+                //ensure the recycle bin has child nodes now            
+                var recycleBin = treeService.getDescendantNode(rootNode, -20);
+                if (recycleBin) {
+                    recycleBin.hasChildren = true;
+                    //reload the recycle bin if it's already expanded so the deleted item is shown
+                    if (recycleBin.expanded) {
+                        treeService.loadNodeChildren({ node: recycleBin, section: "content" });
                     }
-                }, 500);
+                }
             }
-            
+
             //if the current edited item is the same one as we're deleting, we need to navigate elsewhere
             if (editorState.current && editorState.current.id == $scope.currentNode.id) {
 
                 //If the deleted item lived at the root then just redirect back to the root, otherwise redirect to the item's parent
                 var location = "/content";
-                if ($scope.currentNode.parentId.toString() !== "-1")
+                if ($scope.currentNode.parentId.toString() === "-20")
+                    location = "/content/content/recyclebin";
+                else if ($scope.currentNode.parentId.toString() !== "-1")
                     location = "/content/content/edit/" + $scope.currentNode.parentId;
 
                 $location.path(location);
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/notify.html b/src/Umbraco.Web.UI.Client/src/views/content/notify.html
index cb12d92f08..e7c4d4d785 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/notify.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/notify.html
@@ -15,10 +15,11 @@
                     <div class="alert alert-success">
                         <localize key="notify_notificationsSavedFor"></localize><strong> {{currentNode.name}}</strong>
                     </div>
+                    <button class="btn btn-primary" ng-click="vm.cancel()"><localize key="general_ok">Ok</localize></button>
                 </div>
-                <div ng-cloak>
+                <div ng-hide="vm.saveSuccces || vm.saveError" ng-cloak>
                     <div class="block-form" ng-show="!vm.loading">
-                        <h5><localize key="notify_notifySet">Set your notification for</localize> {{ currentNode.name }}</h5>
+                        <localize key="notify_notifySet">Set your notification for</localize> <strong>{{ currentNode.name }}</strong>
                         <umb-control-group>
                             <umb-permission ng-repeat="option in vm.notifyOptions"
                                             name="option.name"
@@ -31,7 +32,7 @@
             </form>
         </div>
     </div>
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
+    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="vm.saveSuccces || vm.saveError">
         <umb-button label-key="general_cancel"
                     action="vm.cancel()"
                     type="button"
@@ -40,6 +41,7 @@
         <umb-button label-key="buttons_save"
                     type="button"
                     action="vm.save(vm.notifyOptions)"
+                    state="vm.saveState"
                     button-style="success">
         </umb-button>
     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
index 974f2ad21b..e5e95e94df 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
@@ -30,6 +30,10 @@ function MediaDeleteController($scope, mediaResource, treeService, navigationSer
                 var recycleBin = treeService.getDescendantNode(rootNode, -21);
                 if (recycleBin) {
                     recycleBin.hasChildren = true;
+                    //reload the recycle bin if it's already expanded so the deleted item is shown
+                    if (recycleBin.expanded) {
+                        treeService.loadNodeChildren({ node: recycleBin, section: "media" });
+                    }
                 }
             }
             
@@ -37,8 +41,10 @@ function MediaDeleteController($scope, mediaResource, treeService, navigationSer
             if (editorState.current && editorState.current.id == $scope.currentNode.id) {
 
             	//If the deleted item lived at the root then just redirect back to the root, otherwise redirect to the item's parent
-            	var location = "/media";
-            	if ($scope.currentNode.parentId.toString() !== "-1")
+                var location = "/media";
+                if ($scope.currentNode.parentId.toString() === "-21")
+                    location = "/media/media/recyclebin";
+            	else if ($scope.currentNode.parentId.toString() !== "-1")
             		location = "/media/media/edit/" + $scope.currentNode.parentId;
 
                 $location.path(location);
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
index 8bb1dc3ac8..163cee9088 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
@@ -5,6 +5,14 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.MoveController",
 	    $scope.dialogTreeApi = {};
         $scope.source = _.clone($scope.currentNode);
 
+        $scope.busy = false;
+        $scope.searchInfo = {
+            searchFromId: null,
+            searchFromName: null,
+            showSearch: false,
+            results: [],
+            selectedSearchResults: []
+        }
         $scope.treeModel = {
             hideHeader: false
         }
@@ -52,6 +60,24 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.MoveController",
         $scope.close = function() {
             navigationService.hideDialog();
         };
+        $scope.hideSearch = function () {
+            $scope.searchInfo.showSearch = false;
+            $scope.searchInfo.searchFromId = null;
+            $scope.searchInfo.searchFromName = null;
+            $scope.searchInfo.results = [];
+        }
+
+        // method to select a search result 
+        $scope.selectResult = function (evt, result) {
+            result.selected = result.selected === true ? false : true;
+            nodeSelectHandler({ event: evt, node: result });
+        };
+
+        //callback when there are search results 
+        $scope.onSearchResults = function (results) {
+            $scope.searchInfo.results = results;
+            $scope.searchInfo.showSearch = true;
+        };
 
 	    $scope.move = function () {
 	        $scope.busy = true;
@@ -83,11 +109,11 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.MoveController",
                     $scope.error = err;
                 });
 	    };
-        
+
 		// Mini list view
 		$scope.selectListViewNode = function (node) {
 			node.selected = node.selected === true ? false : true;
-			nodeSelectHandler({}, { node: node });
+			nodeSelectHandler({ node: node });
 		};
 
 		$scope.closeMiniListView = function () {
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/move.html b/src/Umbraco.Web.UI.Client/src/views/media/move.html
index 451acbdb16..cb0b2fd7ca 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/move.html
@@ -25,16 +25,35 @@
 		    <div ng-hide="success">
             
 			    <div ng-hide="miniListView">
-				    <umb-tree
-					    section="media"
-				            hideheader="{{treeModel.hideHeader}}"
-					    hideoptions="true"
-					    isdialog="true"
+                    <umb-tree-search-box 
+                        hide-search-callback="hideSearch"
+                        search-callback="onSearchResults"
+                        search-from-id="{{searchInfo.searchFromId}}"
+                        search-from-name="{{searchInfo.searchFromName}}"
+                        show-search="{{searchInfo.showSearch}}"
+                        section="media">
+                    </umb-tree-search-box>
+
+                    <br />
+
+                    <umb-tree-search-results
+                        ng-if="searchInfo.showSearch"
+                        results="searchInfo.results"
+                        select-result-callback="selectResult">
+                    </umb-tree-search-results>
+
+                    <div ng-hide="searchInfo.showSearch">
+                        <umb-tree
+                            section="media"
+                            hideheader="{{treeModel.hideHeader}}"
+                            hideoptions="true"
+                            isdialog="true"
 					    api="dialogTreeApi"
                                             on-init="onTreeInit()"
-					    enablelistviewexpand="true"
-					    enablecheckboxes="true">
-				    </umb-tree>
+                            enablelistviewexpand="true"
+                            enablecheckboxes="true">
+                        </umb-tree>
+                    </div>
 			    </div>
 
 			    <umb-mini-list-view
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js
index 20bb8b880f..566535fc98 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js
@@ -24,16 +24,6 @@ angular.module("umbraco")
     		    return ((spans / $scope.columns) * 100).toFixed(8);
     		};
 
-    		$scope.toggleCollection = function(collection, toggle){
-    		    if(toggle){
-    		        collection = [];
-    		    }else{
-    		        collection = null;
-    		    }
-    		};
-
-
-
     		/****************
     		    Section
     		*****************/
@@ -47,8 +37,18 @@ angular.module("umbraco")
     		    }
     		    
     		    $scope.currentSection = section;
+    		    $scope.currentSection.allowAll = section.allowAll || !section.allowed || !section.allowed.length;
     		};
 
+            $scope.toggleAllowed = function (section) {
+                if (section.allowed) {
+                    delete section.allowed;
+                }
+                else {
+                    section.allowed = [];
+                }
+            }
+
     		$scope.deleteSection = function(section, template) {
     			if ($scope.currentSection === section) {
     				$scope.currentSection = undefined;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
index f87262daaf..0e1a92a62c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
@@ -61,8 +61,7 @@
                           <input type="checkbox"
                                  ng-model="currentSection.allowAll"
                                  style="float: left; margin-right: 10px;"
-                                 ng-checked="currentSection.allowed === undefined"
-                                 ng-change="toggleCollection(currentSection.allowed, currentSection.allowAll)" />
+                                 ng-change="toggleAllowed(currentSection)" />
                                  <localize key="grid_allowAllRowConfigurations"/>
                       </label>
                   </li>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js
index 78b607a9a9..4e3dde50e4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js
@@ -22,16 +22,6 @@ function RowConfigController($scope) {
         return ((spans / $scope.columns) * 100).toFixed(8);
     };
 
-    $scope.toggleCollection = function(collection, toggle) {
-        if (toggle) {
-            collection = [];
-        }
-        else {
-            collection = null;
-        }
-    };
-
-
     /****************
         area
     *****************/
@@ -55,9 +45,19 @@ function RowConfigController($scope) {
                 row.areas.push(cell);
             }
             $scope.currentCell = cell;
+            $scope.currentCell.allowAll = cell.allowAll || !cell.allowed || !cell.allowed.length;
         }
     };
 
+    $scope.toggleAllowed = function (cell) {
+        if (cell.allowed) {
+            delete cell.allowed;
+        }
+        else {
+            cell.allowed = [];
+        }
+    }
+
     $scope.deleteArea = function (cell, row) {
     	if ($scope.currentCell === cell) {
     		$scope.currentCell = undefined;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
index b652c9b61c..c9a0d807ea 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
@@ -72,8 +72,7 @@
                       <label>
                           <input type="checkbox"
                               ng-model="currentCell.allowAll"
-                              ng-checked="currentCell.allowed === undefined"
-                              ng-change="toggleCollection(currentCell.allowed, currentCell.allowAll)" />
+                              ng-change="toggleAllowed(currentCell)" />
                               <localize key="grid_allowAllEditors"/>
                       </label>
                   </li>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
index f90972a26b..1d8cdfa03f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
@@ -701,13 +701,17 @@ function listViewController($scope, $routeParams, $injector, $timeout, currentUs
         }
 
         getContentTypesCallback(id).then(function (listViewAllowedTypes) {
-            var blueprints = false;
             $scope.listViewAllowedTypes = listViewAllowedTypes;
 
-            angular.forEach(listViewAllowedTypes, function (allowedType) {
-                angular.forEach(allowedType.blueprints, function (value, key) {
+          var blueprints = false;
+          _.each(listViewAllowedTypes, function (allowedType) {
+              if (_.isEmpty(allowedType.blueprints)) {
+                  // this helps the view understand that there are no blueprints available
+                  allowedType.blueprints = null;
+              }
+              else {
                     blueprints = true;
-                });
+              }
             });
 
             if (listViewAllowedTypes.length === 1 && blueprints === false) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index dfd417ef78..44636d7033 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -46,7 +46,7 @@
                            <umb-dropdown-item ng-repeat="contentType in listViewAllowedTypes track by contentType.key | orderBy:'name':false">
                                <a ng-click="createBlank(entityType,contentType.alias)" prevent-default ng-href="">
                                    <i class="{{::contentType.icon}}"></i>
-                                   {{::contentType.name}} <span ng-show="contentType.blueprints && contentType.blueprints.length != 0" style="text-transform: lowercase;">(<localize key="blueprints_blankBlueprint">blank</localize>)</span>
+                                   {{::contentType.name}} <span ng-show="contentType.blueprints" style="text-transform: lowercase;">(<localize key="blueprints_blankBlueprint">blank</localize>)</span>
                                </a>
                                <a href="" ng-repeat="(key, value) in contentType.blueprints track by key" ng-click="createFromBlueprint(entityType,contentType.alias , key)" prevent-default>
                                    &nbsp;&nbsp;<i class="{{::contentType.icon}}"></i>
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index f0663e54e2..ea5cbafcb0 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -88,7 +88,7 @@
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
     <PackageReference Include="ClientDependency" Version="1.9.7" />
     <PackageReference Include="ClientDependency-Mvc5" Version="1.8.0.0" />
-    <PackageReference Include="Examine" Version="1.0.0-beta046" />
+    <PackageReference Include="Examine" Version="1.0.0-beta067" />
     <PackageReference Include="ImageProcessor.Web" Version="4.9.3.25" />
     <PackageReference Include="ImageProcessor.Web.Config" Version="2.4.1.19" />
     <PackageReference Include="Microsoft.AspNet.Identity.Owin" Version="2.2.2" />
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 5efb8c5649..84028091ce 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -1379,7 +1379,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="userInvited">er blevet inviteret</key>
     <key alias="userInvitedSuccessHelp">En invitation er blevet sendt til den nye bruger med oplysninger om, hvordan man logger ind i Umbraco.</key>
     <key alias="userinviteWelcomeMessage">Hej og velkommen til Umbraco! På bare 1 minut vil du være klar til at komme i gang, vi skal bare have dig til at oprette en adgangskode og tilføje et billede til din avatar.</key>
-    <key alias="userinviteAvatarMessage">Upload et billede for at gøre det nemt for andre brugere at genkende dig.</key>
+    <key alias="userinviteAvatarMessage">Hvis du uploader et billede af dig selv, gør du det nemt for andre brugere at genkende dig. Klik på cirklen ovenfor for at uploade et billede.</key>
     <key alias="writer">Forfatter</key>
     <key alias="change">Skift</key>
     <key alias="yourProfile">Din profil</key>
@@ -1434,8 +1434,8 @@ Mange hilsner fra Umbraco robotten
   <area alias="recycleBin">
     <key alias="contentTrashed">Slettet indhold med Id: {0} Relateret til original "parent" med id: {1}</key>
     <key alias="mediaTrashed">Slettet medie med Id: {0} relateret til original "parent" / mappe med id: {1}</key>
-    <key alias="itemCannotBeRestored">Kan ikke automatisk genoprette dette dokument/medie</key>
-    <key alias="noRestoreRelation">Der findes ikke nogen "Genopret" relation for dette dokument/medie. Brug "Flyt" muligheden fra menuen for at flytte det manuelt.</key>
-    <key alias="restoreUnderRecycled">Det dokument/medie du ønsker at genoprette under ('%0%') er i skraldespanden. Brug "Flyt" muligheden fra menuen for at flytte det manuelt.</key>
+    <key alias="itemCannotBeRestored">Kan ikke automatisk genoprette dette element</key>
+    <key alias="itemCannotBeRestoredHelpText">Der er ikke nogen placering hvor dette element automatisk kan genoprettes. Du kan flytte elementet manuelt i træet nedenfor.</key>
+    <key alias="wasRestored">blev genoprettet under</key>
   </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index a1ab9c6e6c..08d286d41d 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -1706,7 +1706,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="userInvitedSuccessHelp">An invitation has been sent to the new user with details about how to log in to Umbraco.</key>
     <key alias="userinviteWelcomeMessage">Hello there and welcome to Umbraco! In just 1 minute you’ll be good to go, we just need you to setup a password and add a picture for your avatar.</key>
     <key alias="userinviteExpiredMessage">Welcome to Umbraco! Unfortunately your invite has expired. Please contact your administrator and ask them to resend it.</key>
-    <key alias="userinviteAvatarMessage">Upload a picture to make it easy for other users to recognize you.</key>
+        <key alias="userinviteAvatarMessage">Uploading a photo of yourself will make it easy for other users to recognize you. Click the circle above to upload your photo.</key>
     <key alias="writer">Writer</key>
     <key alias="change">Change</key>
     <key alias="yourProfile" version="7.0">Your profile</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 028d8ef8ab..a7b632fc2d 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -292,7 +292,7 @@
   <area alias="media">
     <key alias="clickToUpload">Click to upload</key>
     <key alias="orClickHereToUpload">or click here to choose files</key>
-    <key alias="dragFilesHereToUpload">You can drag files here to upload</key>
+        <key alias="dragFilesHereToUpload">You can drag files here to upload.</key>
     <key alias="disallowedFileType">Cannot upload this file, it does not have an approved file type</key>
     <key alias="maxFileSize">Max file size is</key>
     <key alias="mediaRoot">Media root</key>
@@ -1757,7 +1757,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="userInvitedSuccessHelp">An invitation has been sent to the new user with details about how to log in to Umbraco.</key>
     <key alias="userinviteWelcomeMessage">Hello there and welcome to Umbraco! In just 1 minute you’ll be good to go, we just need you to setup a password and add a picture for your avatar.</key>
     <key alias="userinviteExpiredMessage">Welcome to Umbraco! Unfortunately your invite has expired. Please contact your administrator and ask them to resend it.</key>
-    <key alias="userinviteAvatarMessage">Upload a picture to make it easy for other users to recognize you.</key>
+        <key alias="userinviteAvatarMessage">Uploading a photo of yourself will make it easy for other users to recognize you. Click the circle above to upload your photo.</key>
     <key alias="writer">Writer</key>
     <key alias="change">Change</key>
     <key alias="yourProfile" version="7.0">Your profile</key>
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
index df6fe953fe..fb8ff63ab0 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
@@ -32,6 +32,7 @@
 
     <notifications>
       <!-- the email that should be used as from mail when umbraco sends a notification -->
+      <!-- you can add a display name to the email like thist: <email>Your display name here &lt;your@email.here&gt;</email> -->
       <email>your@email.here</email>
     </notifications>
 
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index e2c127ba1f..c3e146d6ce 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -48,6 +48,7 @@
     </errors>
     <notifications>
       <!-- the email that should be used as from mail when umbraco sends a notification -->
+      <!-- you can add a display name to the email like this: <email>Your display name here &lt;your@email.here&gt;</email> -->
       <email>your@email.here</email>
     </notifications>
 
diff --git a/src/Umbraco.Web/Controllers/UmbLoginController.cs b/src/Umbraco.Web/Controllers/UmbLoginController.cs
index 60b7f3ee21..fc6613200c 100644
--- a/src/Umbraco.Web/Controllers/UmbLoginController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginController.cs
@@ -22,6 +22,7 @@ namespace Umbraco.Web.Controllers
         }
 
         [HttpPost]
+        [ValidateAntiForgeryToken]
         public ActionResult HandleLogin([Bind(Prefix = "loginModel")]LoginModel model)
         {
             if (ModelState.IsValid == false)
diff --git a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
index 46c46a9b72..83f4ae04a1 100644
--- a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
@@ -23,6 +23,7 @@ namespace Umbraco.Web.Controllers
         }
 
         [HttpPost]
+        [ValidateAntiForgeryToken]
         public ActionResult HandleLogout([Bind(Prefix = "logoutModel")]PostRedirectModel model)
         {
             if (ModelState.IsValid == false)
diff --git a/src/Umbraco.Web/Controllers/UmbProfileController.cs b/src/Umbraco.Web/Controllers/UmbProfileController.cs
index 95ad26c8b1..7ee8385edc 100644
--- a/src/Umbraco.Web/Controllers/UmbProfileController.cs
+++ b/src/Umbraco.Web/Controllers/UmbProfileController.cs
@@ -24,6 +24,7 @@ namespace Umbraco.Web.Controllers
         }
 
         [HttpPost]
+        [ValidateAntiForgeryToken]
         public ActionResult HandleUpdateProfile([Bind(Prefix = "profileModel")] ProfileModel model)
         {
             var provider = Core.Security.MembershipProviderExtensions.GetMembersMembershipProvider();
diff --git a/src/Umbraco.Web/Controllers/UmbRegisterController.cs b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
index 8ad8ff0c58..5a5024dad9 100644
--- a/src/Umbraco.Web/Controllers/UmbRegisterController.cs
+++ b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
@@ -23,6 +23,7 @@ namespace Umbraco.Web.Controllers
         }
 
         [HttpPost]
+        [ValidateAntiForgeryToken]
         public ActionResult HandleRegisterMember([Bind(Prefix = "registerModel")]RegisterModel model)
         {
             if (ModelState.IsValid == false)
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 198787371f..2ec92c946e 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -354,6 +354,9 @@ namespace Umbraco.Web.Editors
 
             var emptyContent = Services.ContentService.Create("", parentId, contentType.Alias, Security.GetUserId().ResultOr(0));
             var mapped = MapToDisplay(emptyContent);
+            // translate the content type name if applicable
+            mapped.ContentTypeName = Services.TextService.UmbracoDictionaryTranslate(mapped.ContentTypeName);
+            mapped.DocumentType.Name = Services.TextService.UmbracoDictionaryTranslate(mapped.DocumentType.Name);
 
             //remove the listview app if it exists
             mapped.ContentApps = mapped.ContentApps.Where(x => x.Alias != "umbListView").ToList();
@@ -1062,7 +1065,7 @@ namespace Umbraco.Web.Editors
                 var descendants = Services.EntityService.GetPagedDescendants(contentItem.Id, UmbracoObjectTypes.Document, page++, pageSize, out total,
                                 //order by shallowest to deepest, this allows us to check permissions from top to bottom so we can exit
                                 //early if a permission higher up fails
-                                "path", Direction.Ascending);
+                                ordering: Ordering.By("path", Direction.Ascending));
 
                 foreach (var c in descendants)
                 {
diff --git a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
index 563e8dda1a..2572bed816 100644
--- a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
@@ -89,6 +89,8 @@ namespace Umbraco.Web.Editors
 
             var availableCompositions = Services.ContentTypeService.GetAvailableCompositeContentTypes(source, allContentTypes, filterContentTypes, filterPropertyTypes);
 
+            
+
             var currCompositions = source == null ? new IContentTypeComposition[] { } : source.ContentTypeComposition.ToArray();
             var compAliases = currCompositions.Select(x => x.Alias).ToArray();
             var ancestors = availableCompositions.Ancestors.Select(x => x.Alias);
@@ -97,9 +99,6 @@ namespace Umbraco.Web.Editors
                 .Select(x => new Tuple<EntityBasic, bool>(Mapper.Map<IContentTypeComposition, EntityBasic>(x.Composition), x.Allowed))
                 .Select(x =>
                 {
-                    //translate the name
-                    x.Item1.Name = TranslateItem(x.Item1.Name);
-
                     //we need to ensure that the item is enabled if it is already selected
                     // but do not allow it if it is any of the ancestors
                     if (compAliases.Contains(x.Item1.Alias) && ancestors.Contains(x.Item1.Alias) == false)
@@ -108,11 +107,39 @@ namespace Umbraco.Web.Editors
                         x = new Tuple<EntityBasic, bool>(x.Item1, true);
                     }
 
+                    //translate the name
+                    x.Item1.Name = TranslateItem(x.Item1.Name);
+
+                    var contentType = allContentTypes.FirstOrDefault(c => c.Key == x.Item1.Key);
+                    var containers = GetEntityContainers(contentType, type)?.ToArray();
+                    var containerPath = $"/{(containers != null && containers.Any() ? $"{string.Join("/", containers.Select(c => c.Name))}/" : null)}";
+                    x.Item1.AdditionalData["containerPath"] = containerPath;
+
                     return x;
                 })
                 .ToList();
         }
 
+        private IEnumerable<EntityContainer> GetEntityContainers(IContentTypeComposition contentType, UmbracoObjectTypes type)
+        {
+            if (contentType == null)
+            {
+                return null;
+            }
+
+            switch (type)
+            {
+                case UmbracoObjectTypes.DocumentType:
+                    return Services.ContentTypeService.GetContainers(contentType as IContentType);
+                case UmbracoObjectTypes.MediaType:
+                    return Services.MediaTypeService.GetContainers(contentType as IMediaType);
+                case UmbracoObjectTypes.MemberType:
+                    return new EntityContainer[0];
+                default:
+                    throw new ArgumentOutOfRangeException("The entity type was not a content type");
+            }
+        }
+
         /// <summary>
         /// Returns a list of content types where a particular composition content type is used
         /// </summary>
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index 3cecdbe8e5..5e73f4140e 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -17,6 +17,7 @@ using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using System.Web.Http.Controllers;
 using Examine;
 using Umbraco.Core.Models.Entities;
+using Umbraco.Core.Services;
 using Umbraco.Core.Xml;
 using Umbraco.Web.Models.Mapping;
 using Umbraco.Web.Search;
@@ -477,7 +478,9 @@ namespace Umbraco.Web.Editors
             var objectType = ConvertToObjectType(type);
             if (objectType.HasValue)
             {
-                var entities = Services.EntityService.GetPagedChildren(id, objectType.Value, pageNumber - 1, pageSize, out var totalRecords, orderBy, orderDirection, filter);
+                var entities = Services.EntityService.GetPagedChildren(id, objectType.Value, pageNumber - 1, pageSize, out var totalRecords,
+                    SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains(filter)),
+                    Ordering.By(orderBy, orderDirection));
 
                 if (totalRecords == 0)
                 {
@@ -545,12 +548,18 @@ namespace Umbraco.Web.Editors
                     }
 
                     entities = aids == null || aids.Contains(Constants.System.Root)
-                        ? Services.EntityService.GetPagedDescendants(objectType.Value, pageNumber - 1, pageSize, out totalRecords, orderBy, orderDirection, filter, includeTrashed: false)
-                        : Services.EntityService.GetPagedDescendants(aids, objectType.Value, pageNumber - 1, pageSize, out totalRecords, orderBy, orderDirection, filter);
+                        ? Services.EntityService.GetPagedDescendants(objectType.Value, pageNumber - 1, pageSize, out totalRecords,
+                            SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains(filter)),
+                            Ordering.By(orderBy, orderDirection), includeTrashed: false)
+                        : Services.EntityService.GetPagedDescendants(aids, objectType.Value, pageNumber - 1, pageSize, out totalRecords,
+                            SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains(filter)),
+                            Ordering.By(orderBy, orderDirection));
                 }
                 else
                 {
-                    entities = Services.EntityService.GetPagedDescendants(id, objectType.Value, pageNumber - 1, pageSize, out totalRecords, orderBy, orderDirection, filter);
+                    entities = Services.EntityService.GetPagedDescendants(id, objectType.Value, pageNumber - 1, pageSize, out totalRecords,
+                        SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains(filter)),
+                        Ordering.By(orderBy, orderDirection));
                 }
 
                 if (totalRecords == 0)
diff --git a/src/Umbraco.Web/Editors/ExamineManagementController.cs b/src/Umbraco.Web/Editors/ExamineManagementController.cs
index 2f96ee3d45..b583babee3 100644
--- a/src/Umbraco.Web/Editors/ExamineManagementController.cs
+++ b/src/Umbraco.Web/Editors/ExamineManagementController.cs
@@ -74,8 +74,8 @@ namespace Umbraco.Web.Editors
                 throw new HttpResponseException(msg);
 
             var results = Examine.ExamineExtensions.TryParseLuceneQuery(query)
-                ? searcher.Search(searcher.CreateCriteria().RawQuery(query), maxResults: pageSize * (pageIndex + 1))
-                : searcher.Search(query, true, maxResults: pageSize * (pageIndex + 1));
+                ? searcher.CreateQuery().NativeQuery(query).Execute(maxResults: pageSize * (pageIndex + 1))
+                : searcher.Search(query, maxResults: pageSize * (pageIndex + 1));
 
             var pagedResults = results.Skip(pageIndex * pageSize);
 
@@ -109,7 +109,7 @@ namespace Umbraco.Web.Editors
             if (!validate.IsSuccessStatusCode)
                 throw new HttpResponseException(validate);
 
-            validate = ValidatePopulator(indexName);
+            validate = ValidatePopulator(index);
             if (!validate.IsSuccessStatusCode)
                 throw new HttpResponseException(validate);
 
@@ -134,7 +134,7 @@ namespace Umbraco.Web.Editors
             if (!validate.IsSuccessStatusCode)
                 return validate;
 
-            validate = ValidatePopulator(indexName);
+            validate = ValidatePopulator(index);
             if (!validate.IsSuccessStatusCode)
                 return validate;
 
@@ -201,7 +201,7 @@ namespace Umbraco.Web.Editors
                 Name = indexName,
                 HealthStatus = isHealth.Success ? (isHealth.Result ?? "Healthy") : (isHealth.Result ?? "Unhealthy"),
                 ProviderProperties = properties,
-                CanRebuild = _indexRebuilder.CanRebuild(indexName)
+                CanRebuild = _indexRebuilder.CanRebuild(index)
             };
 
 
@@ -228,13 +228,13 @@ namespace Umbraco.Web.Editors
             return response1;
         }
 
-        private HttpResponseMessage ValidatePopulator(string indexName)
+        private HttpResponseMessage ValidatePopulator(IIndex index)
         {
-            if (_indexRebuilder.CanRebuild(indexName))
+            if (_indexRebuilder.CanRebuild(index))
                 return Request.CreateResponse(HttpStatusCode.OK);
 
             var response = Request.CreateResponse(HttpStatusCode.BadRequest);
-            response.Content = new StringContent($"The index {indexName} cannot be rebuilt because it does not have an associated {typeof(IIndexPopulator)}");
+            response.Content = new StringContent($"The index {index.Name} cannot be rebuilt because it does not have an associated {typeof(IIndexPopulator)}");
             response.ReasonPhrase = "Index cannot be rebuilt";
             return response;
         }
diff --git a/src/Umbraco.Web/HealthCheck/NotificationMethods/IHealthCheckNotificationMethod.cs b/src/Umbraco.Web/HealthCheck/NotificationMethods/IHealthCheckNotificationMethod.cs
index 2b8009d201..f6e8f1d1c5 100644
--- a/src/Umbraco.Web/HealthCheck/NotificationMethods/IHealthCheckNotificationMethod.cs
+++ b/src/Umbraco.Web/HealthCheck/NotificationMethods/IHealthCheckNotificationMethod.cs
@@ -1,9 +1,10 @@
 using System.Threading;
 using System.Threading.Tasks;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Web.HealthCheck.NotificationMethods
 {
-    public interface IHealthCheckNotificationMethod
+    public interface IHealthCheckNotificationMethod : IDiscoverable
     {
         bool Enabled { get; }
         Task SendAsync(HealthCheckResults results, CancellationToken token);
diff --git a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
index 5a7c4e9b15..e47af9d302 100644
--- a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Web;
+using System.Web.Helpers;
 using System.Web.Mvc;
 using System.Web.Mvc.Html;
 using System.Web.Routing;
@@ -219,6 +220,7 @@ namespace Umbraco.Web
             {
                 _viewContext = viewContext;
                 _method = method;
+			    _controllerName = controllerName;
                 _encryptedString = UmbracoHelper.CreateEncryptedRouteString(controllerName, controllerAction, area, additionalRouteVals);
             }
 
@@ -226,6 +228,7 @@ namespace Umbraco.Web
             private readonly FormMethod _method;
             private bool _disposed;
             private readonly string _encryptedString;
+		    private readonly string _controllerName;
 
             protected override void Dispose(bool disposing)
             {
@@ -233,6 +236,16 @@ namespace Umbraco.Web
                     return;
                 this._disposed = true;
 
+                //Detect if the call is targeting UmbRegisterController/UmbProfileController/UmbLoginStatusController/UmbLoginController and if it is we automatically output a AntiForgeryToken()
+                // We have a controllerName and area so we can match
+                if (_controllerName == "UmbRegister"
+                    || _controllerName == "UmbProfile"
+                    || _controllerName == "UmbLoginStatus"
+                    || _controllerName == "UmbLogin")
+			    {
+			        _viewContext.Writer.Write(AntiForgery.GetHtml().ToString());
+			    }
+
                 //write out the hidden surface form routes
                 _viewContext.Writer.Write("<input name='ufprt' type='hidden' value='" + _encryptedString + "' />");
 
diff --git a/src/Umbraco.Web/IPublishedContentQuery.cs b/src/Umbraco.Web/IPublishedContentQuery.cs
index 3ab1c5e3ae..c3a065b9dc 100644
--- a/src/Umbraco.Web/IPublishedContentQuery.cs
+++ b/src/Umbraco.Web/IPublishedContentQuery.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Xml.XPath;
+using Examine.Search;
 using Umbraco.Core;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Xml;
@@ -34,21 +35,36 @@ namespace Umbraco.Web
         /// <summary>
         /// Searches content.
         /// </summary>
-        IEnumerable<PublishedSearchResult> Search(string term, bool useWildCards = true, string indexName = null);
+        /// <param name="term">Term to search.</param>
+        /// <param name="culture">Optional culture.</param>
+        /// <param name="indexName">Optional index name.</param>
+        /// <remarks>
+        /// <para>When the <paramref name="culture"/> is not specified, all cultures are searched.</para>
+        /// </remarks>
+        IEnumerable<PublishedSearchResult> Search(string term, string culture = null, string indexName = null);
 
         /// <summary>
         /// Searches content.
         /// </summary>
-        IEnumerable<PublishedSearchResult> Search(int skip, int take, out long totalRecords, string term, bool useWildCards = true, string indexName = null);
+        /// <param name="term">Term to search.</param>
+        /// <param name="skip">Numbers of items to skip.</param>
+        /// <param name="take">Numbers of items to return.</param>
+        /// <param name="totalRecords">Total number of matching items.</param>
+        /// <param name="culture">Optional culture.</param>
+        /// <param name="indexName">Optional index name.</param>
+        /// <remarks>
+        /// <para>When the <paramref name="culture"/> is not specified, all cultures are searched.</para>
+        /// </remarks>
+        IEnumerable<PublishedSearchResult> Search(string term, int skip, int take, out long totalRecords, string culture = null, string indexName = null);
 
         /// <summary>
-        /// Searches content.
+        /// Executes the query and converts the results to PublishedSearchResult.
         /// </summary>
-        IEnumerable<PublishedSearchResult> Search(Examine.SearchCriteria.ISearchCriteria criteria, Examine.ISearcher searchProvider = null);
+        IEnumerable<PublishedSearchResult> Search(IQueryExecutor query);
 
         /// <summary>
-        /// Searches content.
+        /// Executes the query and converts the results to PublishedSearchResult.
         /// </summary>
-        IEnumerable<PublishedSearchResult> Search(int skip, int take, out long totalRecords, Examine.SearchCriteria.ISearchCriteria criteria, Examine.ISearcher searcher = null);
+        IEnumerable<PublishedSearchResult> Search(IQueryExecutor query, int skip, int take, out long totalRecords);
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
index f203d5d2c9..229a981510 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
@@ -6,8 +6,8 @@ using System.Linq;
 using System.Threading;
 using System.Xml.XPath;
 using Examine;
-using Examine.LuceneEngine.SearchCriteria;
 using Examine.Providers;
+using Examine.Search;
 using Lucene.Net.Store;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
@@ -15,7 +15,6 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Xml;
 using Umbraco.Examine;
-using umbraco;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
@@ -107,10 +106,10 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
                     // first check in Examine for the cache values
                     // +(+parentID:-1) +__IndexType:media
 
-                    var criteria = searchProvider.CreateCriteria("media");
+                    var criteria = searchProvider.CreateQuery("media");
                     var filter = criteria.ParentId(-1).Not().Field(UmbracoExamineIndex.IndexPathFieldName, "-1,-21,".MultipleCharacterWildcard());
 
-                    var result = searchProvider.Search(filter.Compile());
+                    var result = filter.Execute();
                     if (result != null)
                         return result.Select(x => CreateFromCacheValues(ConvertFromSearchResult(x)));
                 }
@@ -293,10 +292,10 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
                     //
                     // note that since the use of the wildcard, it automatically escapes it in Lucene.
 
-                    var criteria = searchProvider.CreateCriteria("media");
+                    var criteria = searchProvider.CreateQuery("media");
                     var filter = criteria.Id(id.ToInvariantString()).Not().Field(UmbracoExamineIndex.IndexPathFieldName, "-1,-21,".MultipleCharacterWildcard());
 
-                    var result = searchProvider.Search(filter.Compile()).FirstOrDefault();
+                    var result = filter.Execute().FirstOrDefault();
                     if (result != null) return ConvertFromSearchResult(result);
                 }
                 catch (Exception ex)
@@ -507,15 +506,15 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
                 try
                 {
                     //first check in Examine as this is WAY faster
-                    var criteria = searchProvider.CreateCriteria("media");
+                    var criteria = searchProvider.CreateQuery("media");
 
-                    var filter = criteria.ParentId(parentId).Not().Field(UmbracoExamineIndex.IndexPathFieldName, "-1,-21,".MultipleCharacterWildcard());
+                    var filter = criteria.ParentId(parentId).Not().Field(UmbracoExamineIndex.IndexPathFieldName, "-1,-21,".MultipleCharacterWildcard())
+                        .OrderBy(new SortableField("sortOrder", SortType.Int));
                     //the above filter will create a query like this, NOTE: That since the use of the wildcard, it automatically escapes it in Lucene.
                     //+(+parentId:3113 -__Path:-1,-21,*) +__IndexType:media
 
                     // sort with the Sort field (updated for 8.0)
-                    var results = searchProvider.Search(
-                        filter.And().OrderBy(new SortableField("sortOrder", SortType.Int)).Compile());
+                    var results = filter.Execute();
 
                     if (results.Any())
                     {
diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index 9a8f3ff7ac..2091d2854d 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -4,12 +4,13 @@ using System.Data;
 using System.Linq;
 using System.Web;
 using Examine;
-using Examine.LuceneEngine.SearchCriteria;
+using Examine.Search;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
+using Umbraco.Examine;
 using Umbraco.Web.Composing;
 
 namespace Umbraco.Web
@@ -266,7 +267,7 @@ namespace Umbraco.Web
 
         #region Search
 
-        public static IEnumerable<PublishedSearchResult> SearchDescendants(this IPublishedContent content, string term, bool useWildCards = true, string indexName = null)
+        public static IEnumerable<PublishedSearchResult> SearchDescendants(this IPublishedContent content, string term, string indexName = null)
         {
             //fixme: pass in the IExamineManager
 
@@ -276,17 +277,18 @@ namespace Umbraco.Web
 
             var searcher = index.GetSearcher();
 
-            var t = term.Escape().Value;
-            if (useWildCards)
-                t = term.MultipleCharacterWildcard().Value;
+            //var t = term.Escape().Value;
+            //var luceneQuery = "+__Path:(" + content.Path.Replace("-", "\\-") + "*) +" + t;
 
-            var luceneQuery = "+__Path:(" + content.Path.Replace("-", "\\-") + "*) +" + t;
-            var crit = searcher.CreateCriteria().RawQuery(luceneQuery);
+            var query = searcher.CreateQuery()
+                .Field(UmbracoExamineIndex.IndexPathFieldName, (content.Path + ",").MultipleCharacterWildcard())
+                .And()
+                .ManagedQuery(term);
 
-            return content.Search(crit, searcher);
+            return query.Execute().ToPublishedSearchResults(UmbracoContext.Current.ContentCache);
         }
 
-        public static IEnumerable<PublishedSearchResult> SearchChildren(this IPublishedContent content, string term, bool useWildCards = true, string indexName = null)
+        public static IEnumerable<PublishedSearchResult> SearchChildren(this IPublishedContent content, string term, string indexName = null)
         {
             //fixme: pass in the IExamineManager
 
@@ -296,28 +298,15 @@ namespace Umbraco.Web
 
             var searcher = index.GetSearcher();
 
-            var t = term.Escape().Value;
-            if (useWildCards)
-                t = term.MultipleCharacterWildcard().Value;
+            //var t = term.Escape().Value;
+            //var luceneQuery = "+parentID:" + content.Id + " +" + t;
 
-            var luceneQuery = "+parentID:" + content.Id + " +" + t;
-            var crit = searcher.CreateCriteria().RawQuery(luceneQuery);
+            var query = searcher.CreateQuery()
+                .Field("parentID", content.Id)
+                .And()
+                .ManagedQuery(term);
 
-            return content.Search(crit, searcher);
-        }
-
-        public static IEnumerable<PublishedSearchResult> Search(this IPublishedContent content, Examine.SearchCriteria.ISearchCriteria criteria, ISearcher searchProvider = null)
-        {
-            //fixme: pass in the IExamineManager
-
-            if (searchProvider == null)
-            {
-                if (!ExamineManager.Instance.TryGetIndex(Constants.UmbracoIndexes.ExternalIndexName, out var index))
-                    throw new InvalidOperationException("No index found with name " + Constants.UmbracoIndexes.ExternalIndexName);
-                searchProvider = index.GetSearcher();
-            }
-            var results = searchProvider.Search(criteria);
-            return results.ToPublishedSearchResults(UmbracoContext.Current.ContentCache);
+            return query.Execute().ToPublishedSearchResults(UmbracoContext.Current.ContentCache);
         }
 
         #endregion
diff --git a/src/Umbraco.Web/PublishedContentQuery.cs b/src/Umbraco.Web/PublishedContentQuery.cs
index 774393f3de..3d8f36ec1a 100644
--- a/src/Umbraco.Web/PublishedContentQuery.cs
+++ b/src/Umbraco.Web/PublishedContentQuery.cs
@@ -2,15 +2,15 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Text.RegularExpressions;
 using System.Xml.XPath;
 using Examine;
-using Examine.LuceneEngine.Providers;
-using Examine.LuceneEngine.SearchCriteria;
-using Examine.SearchCriteria;
+using Examine.Search;
 using Umbraco.Core;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Services;
 using Umbraco.Core.Xml;
+using Umbraco.Examine;
 using Umbraco.Web.PublishedCache;
 
 namespace Umbraco.Web
@@ -181,58 +181,78 @@ namespace Umbraco.Web
         #region Search
 
         /// <inheritdoc />
-        public IEnumerable<PublishedSearchResult> Search(string term, bool useWildCards = true, string indexName = null)
+        public IEnumerable<PublishedSearchResult> Search(string term, string culture = null, string indexName = null)
         {
-            return Search(0, 0, out _, term, useWildCards, indexName);
+            return Search(term, 0, 0, out _, culture, indexName);
         }
 
         /// <inheritdoc />
-        public IEnumerable<PublishedSearchResult> Search(int skip, int take, out long totalRecords, string term, bool useWildCards = true, string indexName = null)
+        public IEnumerable<PublishedSearchResult> Search(string term, int skip, int take, out long totalRecords, string culture = null, string indexName = null)
         {
-            //fixme: inject IExamineManager
-
             indexName = string.IsNullOrEmpty(indexName)
                 ? Constants.UmbracoIndexes.ExternalIndexName
                 : indexName;
 
-            if (!ExamineManager.Instance.TryGetIndex(indexName, out var index))
-                throw new InvalidOperationException($"No index found by name {indexName}");
+            if (!ExamineManager.Instance.TryGetIndex(indexName, out var index) || !(index is IUmbracoIndex umbIndex))
+                throw new InvalidOperationException($"No index found by name {indexName} or is not of type {typeof(IUmbracoIndex)}");
 
-            var searcher = index.GetSearcher();
+            var searcher = umbIndex.GetSearcher();
 
-            var results = skip == 0 && take == 0
-                ? searcher.Search(term, true)
-                : searcher.Search(term, true, maxResults: skip + take);
+            // default to max 500 results
+            var count = skip == 0 && take == 0 ? 500 : skip + take;
 
-            totalRecords = results.TotalItemCount;
-            return results.ToPublishedSearchResults(_contentCache);
-        }
-
-        /// <inheritdoc />
-        public IEnumerable<PublishedSearchResult> Search(ISearchCriteria criteria, ISearcher searchProvider = null)
-        {
-            return Search(0, 0, out _, criteria, searchProvider);
-        }
-
-        /// <inheritdoc />
-        public IEnumerable<PublishedSearchResult> Search(int skip, int take, out long totalRecords, ISearchCriteria criteria, ISearcher searcher = null)
-        {
-            //fixme: inject IExamineManager
-            if (searcher == null)
+            ISearchResults results;
+            if (culture.IsNullOrWhiteSpace())
             {
-                if (!ExamineManager.Instance.TryGetIndex(Constants.UmbracoIndexes.ExternalIndexName, out var index))
-                    throw new InvalidOperationException($"No index found by name {Constants.UmbracoIndexes.ExternalIndexName}");
-                searcher = index.GetSearcher();
+                results = searcher.Search(term, count);
+            }
+            else
+            {
+                //get all index fields suffixed with the culture name supplied
+                var cultureFields = new List<string>();
+                var fields = umbIndex.GetFields();
+                var qry = searcher.CreateQuery().Field(UmbracoContentIndex.VariesByCultureFieldName, 1); //must vary by culture
+                // ReSharper disable once LoopCanBeConvertedToQuery
+                foreach (var field in fields)
+                {
+                    var match = CultureIsoCodeFieldName.Match(field);
+                    if (match.Success && match.Groups.Count == 2 && culture.InvariantEquals(match.Groups[1].Value))
+                        cultureFields.Add(field);
+                }
+
+                qry = qry.And().ManagedQuery(term, cultureFields.ToArray());
+                results = qry.Execute(count);
             }
 
+            totalRecords = results.TotalItemCount;
+            return results.ToPublishedSearchResults(_contentCache);
+        }
+
+        /// <inheritdoc />
+        public IEnumerable<PublishedSearchResult> Search(IQueryExecutor query)
+        {
+            return Search(query, 0, 0, out _);
+        }
+
+        /// <inheritdoc />
+        public IEnumerable<PublishedSearchResult> Search(IQueryExecutor query, int skip, int take, out long totalRecords)
+        {
             var results = skip == 0 && take == 0
-                ? searcher.Search(criteria)
-                : searcher.Search(criteria, maxResults: skip + take);
+                ? query.Execute()
+                : query.Execute(maxResults: skip + take);
 
             totalRecords = results.TotalItemCount;
             return results.ToPublishedSearchResults(_contentCache);
         }
 
+        /// <summary>
+        /// Matches a culture iso name suffix
+        /// </summary>
+        /// <remarks>
+        /// myFieldName_en-us will match the "en-us"
+        /// </remarks>
+        private static readonly Regex CultureIsoCodeFieldName = new Regex("^[_\\w]+_([a-z]{2}-[a-z0-9]{2,4})$", RegexOptions.Compiled);
+
 
         #endregion
     }
diff --git a/src/Umbraco.Web/Search/ExamineComponent.cs b/src/Umbraco.Web/Search/ExamineComponent.cs
index b91b133ace..f27d87a4c3 100644
--- a/src/Umbraco.Web/Search/ExamineComponent.cs
+++ b/src/Umbraco.Web/Search/ExamineComponent.cs
@@ -22,6 +22,7 @@ using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Web.Scheduling;
 using System.Threading.Tasks;
 using Examine.LuceneEngine.Directories;
+using Examine.LuceneEngine.Indexing;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Strings;
 using Umbraco.Web.Models.ContentEditing;
@@ -81,6 +82,11 @@ namespace Umbraco.Web.Search
                     false));
             composition.RegisterUnique<IValueSetBuilder<IMedia>, MediaValueSetBuilder>();
             composition.RegisterUnique<IValueSetBuilder<IMember>, MemberValueSetBuilder>();
+
+            //We want to manage Examine's appdomain shutdown sequence ourselves so first we'll disable Examine's default behavior
+            //and then we'll use MainDom to control Examine's shutdown - this MUST be done in Compose ie before ExamineManager
+            //is instantiated, as the value is used during instantiation
+            ExamineManager.DisableDefaultHostingEnvironmentRegistration();
         }
 
         internal void Initialize(IRuntimeState runtime, IMainDom mainDom, PropertyEditorCollection propertyEditors,
@@ -100,10 +106,6 @@ namespace Umbraco.Web.Search
             _mediaValueSetBuilder = mediaValueSetBuilder;
             _memberValueSetBuilder = memberValueSetBuilder;
 
-            //We want to manage Examine's appdomain shutdown sequence ourselves so first we'll disable Examine's default behavior
-            //and then we'll use MainDom to control Examine's shutdown
-            ExamineManager.DisableDefaultHostingEnvironmentRegistration();
-
             //we want to tell examine to use a different fs lock instead of the default NativeFSFileLock which could cause problems if the appdomain
             //terminates and in some rare cases would only allow unlocking of the file if IIS is forcefully terminated. Instead we'll rely on the simplefslock
             //which simply checks the existence of the lock file
@@ -138,7 +140,7 @@ namespace Umbraco.Web.Search
 
             profilingLogger.Debug<ExamineComponent>("Examine shutdown registered with MainDom");
 
-            var registeredIndexers = examineManager.Indexes.OfType<IUmbracoIndexer>().Count(x => x.EnableDefaultEventHandler);
+            var registeredIndexers = examineManager.Indexes.OfType<IUmbracoIndex>().Count(x => x.EnableDefaultEventHandler);
 
             profilingLogger.Info<ExamineComponent>("Adding examine event handlers for {RegisteredIndexers} index providers.", registeredIndexers);
 
@@ -155,10 +157,10 @@ namespace Umbraco.Web.Search
 
             EnsureUnlocked(profilingLogger, examineManager);
 
+            //TODO: Instead of waiting 5000 ms, we could add an event handler on to fulfilling the first request, then start?
             RebuildIndexes(indexRebuilder, profilingLogger, true, 5000);
         }
 
-
         /// <summary>
         /// Called to rebuild empty indexes on startup
         /// </summary>
@@ -469,7 +471,7 @@ namespace Umbraco.Web.Search
                 //Delete all content of this content/media/member type that is in any content indexer by looking up matched examine docs
                 foreach (var id in ci.Value.removedIds)
                 {
-                    foreach (var index in _examineManager.Indexes.OfType<IUmbracoIndexer>())
+                    foreach (var index in _examineManager.Indexes.OfType<IUmbracoIndex>())
                     {
                         var searcher = index.GetSearcher();
 
@@ -478,9 +480,7 @@ namespace Umbraco.Web.Search
                         while (page * pageSize < total)
                         {
                             //paging with examine, see https://shazwazza.com/post/paging-with-examine/
-                            var results = searcher.Search(
-                                    searcher.CreateCriteria().Field("nodeType", id).Compile(),
-                                    maxResults: pageSize * (page + 1));
+                            var results = searcher.CreateQuery().Field("nodeType", id).Execute(maxResults: pageSize * (page + 1));
                             total = results.TotalItemCount;
                             var paged = results.Skip(page * pageSize);
 
@@ -571,7 +571,6 @@ namespace Umbraco.Web.Search
             }
         }
 
-
         #endregion
 
         #region ReIndex/Delete for entity
@@ -675,7 +674,7 @@ namespace Umbraco.Web.Search
 
             public static void Execute(ExamineComponent examineComponent, IContent content, bool isPublished)
             {
-                foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndexer>()
+                foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
                     //filter the indexers
                     .Where(x => isPublished || !x.PublishedValuesOnly)
                     .Where(x => x.EnableDefaultEventHandler))
@@ -712,7 +711,7 @@ namespace Umbraco.Web.Search
             {
                 var valueSet = examineComponent._mediaValueSetBuilder.GetValueSets(media).ToList();
 
-                foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndexer>()
+                foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
                     //filter the indexers
                     .Where(x => isPublished || !x.PublishedValuesOnly)
                     .Where(x => x.EnableDefaultEventHandler))
@@ -741,7 +740,7 @@ namespace Umbraco.Web.Search
             public static void Execute(ExamineComponent examineComponent, IMember member)
             {
                 var valueSet = examineComponent._memberValueSetBuilder.GetValueSets(member).ToList();
-                foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndexer>()
+                foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
                     //filter the indexers
                     .Where(x => x.EnableDefaultEventHandler))
                 {
@@ -771,8 +770,7 @@ namespace Umbraco.Web.Search
             public static void Execute(ExamineComponent examineComponent, int id, bool keepIfUnpublished)
             {
                 var strId = id.ToString(CultureInfo.InvariantCulture);
-                foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndexer>()
-
+                foreach (var index in examineComponent._examineManager.Indexes.OfType<IUmbracoIndex>()
                     .Where(x => (keepIfUnpublished && !x.PublishedValuesOnly) || !keepIfUnpublished)
                     .Where(x => x.EnableDefaultEventHandler))
                 {
diff --git a/src/Umbraco.Web/Search/GenericIndexDiagnostics.cs b/src/Umbraco.Web/Search/GenericIndexDiagnostics.cs
index 32c8d43575..560fb19f09 100644
--- a/src/Umbraco.Web/Search/GenericIndexDiagnostics.cs
+++ b/src/Umbraco.Web/Search/GenericIndexDiagnostics.cs
@@ -33,7 +33,7 @@ namespace Umbraco.Web.Search
             try
             {
                 var searcher = _index.GetSearcher();
-                var result = searcher.Search("test", false);
+                var result = searcher.Search("test");
                 return Attempt<string>.Succeed(); //if we can search we'll assume it's healthy
             }
             catch (Exception e)
diff --git a/src/Umbraco.Web/Search/UmbracoIndexesCreator.cs b/src/Umbraco.Web/Search/UmbracoIndexesCreator.cs
index 77a8f3f47c..0f587797af 100644
--- a/src/Umbraco.Web/Search/UmbracoIndexesCreator.cs
+++ b/src/Umbraco.Web/Search/UmbracoIndexesCreator.cs
@@ -59,8 +59,7 @@ namespace Umbraco.Web.Search
         {
             var index = new UmbracoContentIndex(
                 Constants.UmbracoIndexes.InternalIndexName,
-                //fixme - how to deal with languages like in UmbracoContentIndexer.CreateFieldValueTypes
-                UmbracoExamineIndex.UmbracoIndexFieldDefinitions,
+                new UmbracoFieldDefinitionCollection(),
                 CreateFileSystemLuceneDirectory(Constants.UmbracoIndexes.InternalIndexPath),
                 new CultureInvariantWhitespaceAnalyzer(),
                 ProfilingLogger,
@@ -73,8 +72,7 @@ namespace Umbraco.Web.Search
         {
             var index = new UmbracoContentIndex(
                 Constants.UmbracoIndexes.ExternalIndexName,
-                //fixme - how to deal with languages like in UmbracoContentIndexer.CreateFieldValueTypes
-                UmbracoExamineIndex.UmbracoIndexFieldDefinitions,
+                new UmbracoFieldDefinitionCollection(),
                 CreateFileSystemLuceneDirectory(Constants.UmbracoIndexes.ExternalIndexPath),
                 new StandardAnalyzer(Lucene.Net.Util.Version.LUCENE_30),
                 ProfilingLogger,
@@ -87,8 +85,7 @@ namespace Umbraco.Web.Search
         {
             var index = new UmbracoMemberIndex(
                 Constants.UmbracoIndexes.MembersIndexName,
-                //fixme - how to deal with languages like in UmbracoContentIndexer.CreateFieldValueTypes
-                UmbracoExamineIndex.UmbracoIndexFieldDefinitions,
+                new UmbracoFieldDefinitionCollection(),
                 CreateFileSystemLuceneDirectory(Constants.UmbracoIndexes.MembersIndexPath),
                 new CultureInvariantWhitespaceAnalyzer(),
                 ProfilingLogger,
diff --git a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
index c3ab7318a0..47e73d383c 100644
--- a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
+++ b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
@@ -109,11 +109,9 @@ namespace Umbraco.Web.Search
                 return Enumerable.Empty<SearchResultEntity>();
             }
 
-            var raw = internalSearcher.CreateCriteria().RawQuery(sb.ToString());
-
-            var result = internalSearcher
+            var result = internalSearcher.CreateQuery().NativeQuery(sb.ToString())
                 //only return the number of items specified to read up to the amount of records to fill from 0 -> the number of items on the page requested
-                .Search(raw, Convert.ToInt32(pageSize * (pageIndex + 1)));
+                .Execute(Convert.ToInt32(pageSize * (pageIndex + 1)));
 
             totalFound = result.TotalItemCount;
 
diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs
index a09c6fc039..0fa4718766 100644
--- a/src/Umbraco.Web/Trees/ContentTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeController.cs
@@ -263,6 +263,7 @@ namespace Umbraco.Web.Trees
         {
             var menu = new MenuItemCollection();
             menu.Items.Add<ActionRestore>(Services.TextService, opensDialog: true);
+            menu.Items.Add<ActionMove>(Services.TextService, opensDialog: true);
             menu.Items.Add<ActionDelete>(Services.TextService, opensDialog: true);
 
             menu.Items.Add(new RefreshNode(Services.TextService, true));
diff --git a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
index 5a9ee32e63..1e0bd8b619 100644
--- a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
@@ -7,6 +7,7 @@ using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Services;
 using Umbraco.Web.Actions;
 
@@ -145,7 +146,8 @@ namespace Umbraco.Web.Trees
 
         public IEnumerable<SearchResultEntity> Search(string query, int pageSize, long pageIndex, out long totalFound, string searchFrom = null)
         {
-            var results = Services.EntityService.GetPagedDescendants(UmbracoObjectTypes.DocumentType, pageIndex, pageSize, out totalFound, filter: query);
+            var results = Services.EntityService.GetPagedDescendants(UmbracoObjectTypes.DocumentType, pageIndex, pageSize, out totalFound,
+                filter: SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains(query)));
             return Mapper.Map<IEnumerable<SearchResultEntity>>(results);
         }
     }
diff --git a/src/Umbraco.Web/Trees/DataTypeTreeController.cs b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
index 0970481357..b8e77f981d 100644
--- a/src/Umbraco.Web/Trees/DataTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
@@ -5,6 +5,7 @@ using System.Net.Http.Formatting;
 using AutoMapper;
 using Umbraco.Core;
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.Entities;
 using Umbraco.Web.Models.Trees;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi.Filters;
@@ -144,7 +145,8 @@ namespace Umbraco.Web.Trees
 
         public IEnumerable<SearchResultEntity> Search(string query, int pageSize, long pageIndex, out long totalFound, string searchFrom = null)
         {
-            var results = Services.EntityService.GetPagedDescendants(UmbracoObjectTypes.DataType, pageIndex, pageSize, out totalFound, filter: query);
+            var results = Services.EntityService.GetPagedDescendants(UmbracoObjectTypes.DataType, pageIndex, pageSize, out totalFound,
+                filter: SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains(query)));
             return Mapper.Map<IEnumerable<SearchResultEntity>>(results);
         }
     }
diff --git a/src/Umbraco.Web/Trees/MediaTreeController.cs b/src/Umbraco.Web/Trees/MediaTreeController.cs
index 47cd1cb693..d88b2b9402 100644
--- a/src/Umbraco.Web/Trees/MediaTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTreeController.cs
@@ -121,24 +121,27 @@ namespace Umbraco.Web.Trees
                 return menu;
             }
 
-            //return a normal node menu:
-            menu.Items.Add<ActionNew>(Services.TextService, opensDialog: true);
-            menu.Items.Add<ActionMove>(Services.TextService, opensDialog: true);
-            menu.Items.Add<ActionDelete>(Services.TextService, opensDialog: true);
-            menu.Items.Add<ActionSort>(Services.TextService);
-            menu.Items.Add(new RefreshNode(Services.TextService, true));
 
-            //if the media item is in the recycle bin, don't have a default menu, just show the regular menu
+            //if the media item is in the recycle bin, we don't have a default menu and we need to show a limited menu
             if (item.Path.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries).Contains(RecycleBinId.ToInvariantString()))
             {
+                menu.Items.Add<ActionRestore>(Services.TextService, opensDialog: true);
+                menu.Items.Add<ActionMove>(Services.TextService, opensDialog: true);
+                menu.Items.Add<ActionDelete>(Services.TextService, opensDialog: true);
+                menu.Items.Add(new RefreshNode(Services.TextService, true));
+
                 menu.DefaultMenuAlias = null;
-                menu.Items.Insert(2, new MenuItem(ActionRestore.ActionAlias, Services.TextService)
-                {
-                    OpensDialog = true
-                });
+                
             }
             else
             {
+                //return a normal node menu:
+                menu.Items.Add<ActionNew>(Services.TextService, opensDialog: true);
+                menu.Items.Add<ActionMove>(Services.TextService, opensDialog: true);
+                menu.Items.Add<ActionDelete>(Services.TextService, opensDialog: true);
+                menu.Items.Add<ActionSort>(Services.TextService);
+                menu.Items.Add(new RefreshNode(Services.TextService, true));
+
                 //set the default to create
                 menu.DefaultMenuAlias = ActionNew.ActionAlias;
             }
@@ -171,6 +174,6 @@ namespace Umbraco.Web.Trees
             // do not want to make public on the interface. Unfortunately also prevents this from being unit tested.
             // See this issue for details on why we need this:
             // https://github.com/umbraco/Umbraco-CMS/issues/3457
-            => ((EntityService)Services.EntityService).GetMediaChildrenWithoutPropertyData(entityId).ToList();
+            => ((EntityService)Services.EntityService).GetMediaChildrenWithoutPropertyData(entityId).ToList();        
     }
 }
diff --git a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
index 1ba78d7dbf..ff87819fa2 100644
--- a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
@@ -7,6 +7,8 @@ using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.Entities;
+using Umbraco.Core.Persistence.Querying;
 using Umbraco.Web.Models.Trees;
 using Umbraco.Web.WebApi.Filters;
 using Umbraco.Core.Services;
@@ -136,7 +138,8 @@ namespace Umbraco.Web.Trees
 
         public IEnumerable<SearchResultEntity> Search(string query, int pageSize, long pageIndex, out long totalFound, string searchFrom = null)
         {
-            var results = Services.EntityService.GetPagedDescendants(UmbracoObjectTypes.MediaType, pageIndex, pageSize, out totalFound, filter: query);
+            var results = Services.EntityService.GetPagedDescendants(UmbracoObjectTypes.MediaType, pageIndex, pageSize, out totalFound,
+                filter: SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains(query)));
             return Mapper.Map<IEnumerable<SearchResultEntity>>(results);
         }
     }
diff --git a/src/Umbraco.Web/Trees/TemplatesTreeController.cs b/src/Umbraco.Web/Trees/TemplatesTreeController.cs
index 56f47695a0..fce51e2435 100644
--- a/src/Umbraco.Web/Trees/TemplatesTreeController.cs
+++ b/src/Umbraco.Web/Trees/TemplatesTreeController.cs
@@ -135,7 +135,8 @@ namespace Umbraco.Web.Trees
 
         public IEnumerable<SearchResultEntity> Search(string query, int pageSize, long pageIndex, out long totalFound, string searchFrom = null)
         {
-            var results = Services.EntityService.GetPagedDescendants(UmbracoObjectTypes.Template, pageIndex, pageSize, out totalFound, filter: query);
+            var results = Services.EntityService.GetPagedDescendants(UmbracoObjectTypes.Template, pageIndex, pageSize, out totalFound,
+                filter: SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains(query)));
             return Mapper.Map<IEnumerable<SearchResultEntity>>(results);
         }
     }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index d00ebaaeb6..2709335365 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -63,7 +63,7 @@
     <PackageReference Include="AutoMapper" Version="7.0.1" />
     <PackageReference Include="ClientDependency" Version="1.9.7" />
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
-    <PackageReference Include="Examine" Version="1.0.0-beta046" />
+    <PackageReference Include="Examine" Version="1.0.0-beta067" />
     <PackageReference Include="HtmlAgilityPack" Version="1.8.9" />
     <PackageReference Include="ImageProcessor">
       <Version>2.6.2.25</Version>
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 3c7e0d3738..6914efb3e2 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -776,62 +776,6 @@ namespace Umbraco.Web
 
         #endregion
 
-        #region Search
-
-        /// <summary>
-        /// Searches content.
-        /// </summary>
-        /// <param name="term"></param>
-        /// <param name="useWildCards"></param>
-        /// <param name="indexName"></param>
-        /// <returns></returns>
-        public IEnumerable<PublishedSearchResult> Search(string term, bool useWildCards = true, string indexName = null)
-        {
-            return ContentQuery.Search(term, useWildCards, indexName);
-        }
-
-        /// <summary>
-        /// Searches content.
-        /// </summary>
-        /// <param name="skip"></param>
-        /// <param name="take"></param>
-        /// <param name="totalRecords"></param>
-        /// <param name="term"></param>
-        /// <param name="useWildCards"></param>
-        /// <param name="indexName"></param>
-        /// <returns></returns>
-        public IEnumerable<PublishedSearchResult> Search(int skip, int take, out long totalRecords, string term, bool useWildCards = true, string indexName = null)
-        {
-            return ContentQuery.Search(skip, take, out totalRecords, term, useWildCards, indexName);
-        }
-
-        /// <summary>
-        /// Searhes content.
-        /// </summary>
-        /// <param name="skip"></param>
-        /// <param name="take"></param>
-        /// <param name="totalRecords"></param>
-        /// <param name="criteria"></param>
-        /// <param name="searchProvider"></param>
-        /// <returns></returns>
-        public IEnumerable<PublishedSearchResult> Search(int skip, int take, out long totalRecords, Examine.SearchCriteria.ISearchCriteria criteria, Examine.Providers.BaseSearchProvider searchProvider = null)
-        {
-            return ContentQuery.Search(skip, take, out totalRecords, criteria, searchProvider);
-        }
-
-        /// <summary>
-        /// Searhes content.
-        /// </summary>
-        /// <param name="criteria"></param>
-        /// <param name="searchProvider"></param>
-        /// <returns></returns>
-        public IEnumerable<PublishedSearchResult> Search(Examine.SearchCriteria.ISearchCriteria criteria, Examine.Providers.BaseSearchProvider searchProvider = null)
-        {
-            return ContentQuery.Search(criteria, searchProvider);
-        }
-
-        #endregion
-
         #region Strings
 
         /// <summary>