diff --git a/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs b/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
index 22db218564..93e0d41315 100644
--- a/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
@@ -475,7 +475,7 @@ AND umbracoNode.id <> @id",
             var sql = new Sql();
             sql.Select("*")
                .From<NodeDto>(SqlSyntax)
-               .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId && x.Text.StartsWith(nodeName));
+               .Where<NodeDto>(SqlSyntax, x => x.NodeObjectType == NodeObjectTypeId && x.Text.StartsWith(nodeName));
 
             int uniqueNumber = 1;
             var currentName = nodeName;
diff --git a/src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs b/src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
index d16cab25ca..ed37ec8885 100644
--- a/src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
@@ -58,7 +58,7 @@ namespace Umbraco.Core.Persistence.Repositories
 
             //this needs to be sorted since that is the way legacy worked - default language is the first one!!
             //even though legacy didn't sort, it should be by id
-            sql.OrderBy<LanguageDto>(dto => dto.Id, SqlSyntax);
+            sql.OrderBy<LanguageDto>(SqlSyntax, dto => dto.Id);
 
             
             return Database.Fetch<LanguageDto>(sql).Select(ConvertFromDto);
diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
index c85db5a4e2..a1f8ae4061 100644
--- a/src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
@@ -33,7 +33,7 @@ namespace Umbraco.Core.Persistence.Repositories
         {
             var sql = GetBaseQuery(false);
             sql.Where(GetBaseWhereClause(), new { Id = id });
-            sql.OrderByDescending<NodeDto>(x => x.NodeId, SqlSyntax);
+            sql.OrderByDescending<NodeDto>(SqlSyntax, x => x.NodeId);
 
             var dtos =
                 Database.Fetch<MemberTypeReadOnlyDto, PropertyTypeReadOnlyDto, PropertyTypeGroupReadOnlyDto, MemberTypeReadOnlyDto>(
@@ -56,7 +56,7 @@ namespace Umbraco.Core.Persistence.Repositories
                 var statement = string.Join(" OR ", ids.Select(x => string.Format("umbracoNode.id='{0}'", x)));
                 sql.Where(statement);
             }
-            sql.OrderByDescending<NodeDto>(x => x.NodeId);
+            sql.OrderByDescending<NodeDto>(SqlSyntax, x => x.NodeId);
 
             var dtos =
                 Database.Fetch<MemberTypeReadOnlyDto, PropertyTypeReadOnlyDto, PropertyTypeGroupReadOnlyDto, MemberTypeReadOnlyDto>(
@@ -72,7 +72,7 @@ namespace Umbraco.Core.Persistence.Repositories
             var subquery = translator.Translate();
             var sql = GetBaseQuery(false)
                 .Append(new Sql("WHERE umbracoNode.id IN (" + subquery.SQL + ")", subquery.Arguments))
-                .OrderBy<NodeDto>(x => x.SortOrder);
+                .OrderBy<NodeDto>(SqlSyntax, x => x.SortOrder);
 
             var dtos =
                 Database.Fetch<MemberTypeReadOnlyDto, PropertyTypeReadOnlyDto, PropertyTypeGroupReadOnlyDto, MemberTypeReadOnlyDto>(
@@ -92,9 +92,9 @@ namespace Umbraco.Core.Persistence.Repositories
             if (isCount)
             {
                 sql.Select("COUNT(*)")
-                    .From<NodeDto>()
-                    .InnerJoin<ContentTypeDto>().On<ContentTypeDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+                    .From<NodeDto>(SqlSyntax)
+                    .InnerJoin<ContentTypeDto>(SqlSyntax).On<ContentTypeDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
+                    .Where<NodeDto>(SqlSyntax, x => x.NodeObjectType == NodeObjectTypeId);
                 return sql;
             }
 
@@ -105,13 +105,13 @@ namespace Umbraco.Core.Persistence.Repositories
                 "cmsDataType.propertyEditorAlias", "cmsDataType.dbType", "cmsPropertyTypeGroup.id AS PropertyTypeGroupId", 
                 "cmsPropertyTypeGroup.text AS PropertyGroupName",
                 "cmsPropertyTypeGroup.sortorder AS PropertyGroupSortOrder", "cmsPropertyTypeGroup.contenttypeNodeId")
-                .From<NodeDto>()
-                .InnerJoin<ContentTypeDto>().On<ContentTypeDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-                .LeftJoin<PropertyTypeDto>().On<PropertyTypeDto, NodeDto>(left => left.ContentTypeId, right => right.NodeId)
-                .LeftJoin<MemberTypeDto>().On<MemberTypeDto, PropertyTypeDto>(left => left.PropertyTypeId, right => right.Id)
-                .LeftJoin<DataTypeDto>().On<DataTypeDto, PropertyTypeDto>(left => left.DataTypeId, right => right.DataTypeId)
-                .LeftJoin<PropertyTypeGroupDto>().On<PropertyTypeGroupDto, NodeDto>(left => left.ContentTypeNodeId, right => right.NodeId)
-                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+                .From<NodeDto>(SqlSyntax)
+                .InnerJoin<ContentTypeDto>(SqlSyntax).On<ContentTypeDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
+                .LeftJoin<PropertyTypeDto>(SqlSyntax).On<PropertyTypeDto, NodeDto>(SqlSyntax, left => left.ContentTypeId, right => right.NodeId)
+                .LeftJoin<MemberTypeDto>(SqlSyntax).On<MemberTypeDto, PropertyTypeDto>(SqlSyntax, left => left.PropertyTypeId, right => right.Id)
+                .LeftJoin<DataTypeDto>(SqlSyntax).On<DataTypeDto, PropertyTypeDto>(SqlSyntax, left => left.DataTypeId, right => right.DataTypeId)
+                .LeftJoin<PropertyTypeGroupDto>(SqlSyntax).On<PropertyTypeGroupDto, NodeDto>(SqlSyntax, left => left.ContentTypeNodeId, right => right.NodeId)
+                .Where<NodeDto>(SqlSyntax, x => x.NodeObjectType == NodeObjectTypeId);
             return sql;
         }
 
@@ -119,13 +119,13 @@ namespace Umbraco.Core.Persistence.Repositories
         {
             var sql = new Sql()
                 .Select("DISTINCT(umbracoNode.id)")
-                .From<NodeDto>()
-                .InnerJoin<ContentTypeDto>().On<ContentTypeDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-                .LeftJoin<PropertyTypeDto>().On<PropertyTypeDto, NodeDto>(left => left.ContentTypeId, right => right.NodeId)
-                .LeftJoin<MemberTypeDto>().On<MemberTypeDto, PropertyTypeDto>(left => left.PropertyTypeId, right => right.Id)
-                .LeftJoin<DataTypeDto>().On<DataTypeDto, PropertyTypeDto>(left => left.DataTypeId, right => right.DataTypeId)
-                .LeftJoin<PropertyTypeGroupDto>().On<PropertyTypeGroupDto, NodeDto>(left => left.ContentTypeNodeId, right => right.NodeId)
-                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+                .From<NodeDto>(SqlSyntax)
+                .InnerJoin<ContentTypeDto>(SqlSyntax).On<ContentTypeDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
+                .LeftJoin<PropertyTypeDto>(SqlSyntax).On<PropertyTypeDto, NodeDto>(SqlSyntax, left => left.ContentTypeId, right => right.NodeId)
+                .LeftJoin<MemberTypeDto>(SqlSyntax).On<MemberTypeDto, PropertyTypeDto>(SqlSyntax, left => left.PropertyTypeId, right => right.Id)
+                .LeftJoin<DataTypeDto>(SqlSyntax).On<DataTypeDto, PropertyTypeDto>(SqlSyntax, left => left.DataTypeId, right => right.DataTypeId)
+                .LeftJoin<PropertyTypeGroupDto>(SqlSyntax).On<PropertyTypeGroupDto, NodeDto>(SqlSyntax, left => left.ContentTypeNodeId, right => right.NodeId)
+                .Where<NodeDto>(SqlSyntax, x => x.NodeObjectType == NodeObjectTypeId);
             return sql;
         }
 
@@ -259,7 +259,7 @@ namespace Umbraco.Core.Persistence.Repositories
         {
             var sql = GetBaseQuery(false);
             sql.Where("umbracoNode.uniqueID = @Id", new { Id = id });
-            sql.OrderByDescending<NodeDto>(x => x.NodeId);
+            sql.OrderByDescending<NodeDto>(SqlSyntax, x => x.NodeId);
 
             var dtos =
                 Database.Fetch<MemberTypeReadOnlyDto, PropertyTypeReadOnlyDto, PropertyTypeGroupReadOnlyDto, MemberTypeReadOnlyDto>(
@@ -282,7 +282,7 @@ namespace Umbraco.Core.Persistence.Repositories
                 var statement = string.Join(" OR ", ids.Select(x => string.Format("umbracoNode.uniqueID='{0}'", x)));
                 sql.Where(statement);
             }
-            sql.OrderByDescending<NodeDto>(x => x.NodeId, SqlSyntax);
+            sql.OrderByDescending<NodeDto>(SqlSyntax, x => x.NodeId);
 
             var dtos =
                 Database.Fetch<MemberTypeReadOnlyDto, PropertyTypeReadOnlyDto, PropertyTypeGroupReadOnlyDto, MemberTypeReadOnlyDto>(
diff --git a/src/Umbraco.Core/Persistence/Repositories/MigrationEntryRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MigrationEntryRepository.cs
index aa07241d4c..c10e9169a4 100644
--- a/src/Umbraco.Core/Persistence/Repositories/MigrationEntryRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/MigrationEntryRepository.cs
@@ -121,7 +121,7 @@ namespace Umbraco.Core.Persistence.Repositories
 
             var sql = new Sql().Select("*")
                 .From<MigrationDto>(SqlSyntax)
-                .Where<MigrationDto>(x => x.Name.InvariantEquals(migrationName) && x.Version == versionString);
+                .Where<MigrationDto>(SqlSyntax, x => x.Name.InvariantEquals(migrationName) && x.Version == versionString);
 
             var result = Database.FirstOrDefault<MigrationDto>(sql);
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
index f0b6d22ad5..86de4d7052 100644
--- a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
@@ -48,9 +48,9 @@ namespace Umbraco.Core.Persistence.Repositories
                 .On<ContentVersionDto, ContentDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
                 .InnerJoin<NodeDto>(SqlSyntax)
                 .On<ContentDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
-                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
-                .Where<NodeDto>(x => x.NodeId == id)
-                .OrderByDescending<ContentVersionDto>(x => x.VersionDate, SqlSyntax);
+                .Where<NodeDto>(SqlSyntax, x => x.NodeObjectType == NodeObjectTypeId)
+                .Where<NodeDto>(SqlSyntax, x => x.NodeId == id)
+                .OrderByDescending<ContentVersionDto>(SqlSyntax, x => x.VersionDate);
 
             var dtos = Database.Fetch<ContentVersionDto, ContentDto, NodeDto>(sql);
             foreach (var dto in dtos)
@@ -118,21 +118,21 @@ namespace Umbraco.Core.Persistence.Repositories
             if (contentTypeAlias.IsNullOrWhiteSpace())
             {
                 sql.Select("COUNT(*)")
-                    .From<NodeDto>()
-                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
-                    .Where<NodeDto>(x => x.Path.Contains(pathMatch));
+                    .From<NodeDto>(SqlSyntax)
+                    .Where<NodeDto>(SqlSyntax, x => x.NodeObjectType == NodeObjectTypeId)
+                    .Where<NodeDto>(SqlSyntax, x => x.Path.Contains(pathMatch));
             }
             else
             {
                 sql.Select("COUNT(*)")
-                    .From<NodeDto>()
-                    .InnerJoin<ContentDto>()
-                    .On<NodeDto, ContentDto>(left => left.NodeId, right => right.NodeId)
-                    .InnerJoin<ContentTypeDto>()
-                    .On<ContentTypeDto, ContentDto>(left => left.NodeId, right => right.ContentTypeId)
-                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
-                    .Where<NodeDto>(x => x.Path.Contains(pathMatch))
-                    .Where<ContentTypeDto>(x => x.Alias == contentTypeAlias);
+                    .From<NodeDto>(SqlSyntax)
+                    .InnerJoin<ContentDto>(SqlSyntax)
+                    .On<NodeDto, ContentDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
+                    .InnerJoin<ContentTypeDto>(SqlSyntax)
+                    .On<ContentTypeDto, ContentDto>(SqlSyntax, left => left.NodeId, right => right.ContentTypeId)
+                    .Where<NodeDto>(SqlSyntax, x => x.NodeObjectType == NodeObjectTypeId)
+                    .Where<NodeDto>(SqlSyntax, x => x.Path.Contains(pathMatch))
+                    .Where<ContentTypeDto>(SqlSyntax, x => x.Alias == contentTypeAlias);
             }
 
             return Database.ExecuteScalar<int>(sql);
@@ -144,21 +144,21 @@ namespace Umbraco.Core.Persistence.Repositories
             if (contentTypeAlias.IsNullOrWhiteSpace())
             {
                 sql.Select("COUNT(*)")
-                    .From<NodeDto>()
-                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
-                    .Where<NodeDto>(x => x.ParentId == parentId);
+                    .From<NodeDto>(SqlSyntax)
+                    .Where<NodeDto>(SqlSyntax, x => x.NodeObjectType == NodeObjectTypeId)
+                    .Where<NodeDto>(SqlSyntax, x => x.ParentId == parentId);
             }
             else
             {
                 sql.Select("COUNT(*)")
-                    .From<NodeDto>()
-                    .InnerJoin<ContentDto>()
-                    .On<NodeDto, ContentDto>(left => left.NodeId, right => right.NodeId)
-                    .InnerJoin<ContentTypeDto>()
-                    .On<ContentTypeDto, ContentDto>(left => left.NodeId, right => right.ContentTypeId)
-                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
-                    .Where<NodeDto>(x => x.ParentId == parentId)
-                    .Where<ContentTypeDto>(x => x.Alias == contentTypeAlias);
+                    .From<NodeDto>(SqlSyntax)
+                    .InnerJoin<ContentDto>(SqlSyntax)
+                    .On<NodeDto, ContentDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
+                    .InnerJoin<ContentTypeDto>(SqlSyntax)
+                    .On<ContentTypeDto, ContentDto>(SqlSyntax, left => left.NodeId, right => right.ContentTypeId)
+                    .Where<NodeDto>(SqlSyntax, x => x.NodeObjectType == NodeObjectTypeId)
+                    .Where<NodeDto>(SqlSyntax, x => x.ParentId == parentId)
+                    .Where<ContentTypeDto>(SqlSyntax, x => x.Alias == contentTypeAlias);
             }
 
             return Database.ExecuteScalar<int>(sql);
@@ -175,19 +175,19 @@ namespace Umbraco.Core.Persistence.Repositories
             if (contentTypeAlias.IsNullOrWhiteSpace())
             {
                 sql.Select("COUNT(*)")
-                    .From<NodeDto>()
-                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+                    .From<NodeDto>(SqlSyntax)
+                    .Where<NodeDto>(SqlSyntax, x => x.NodeObjectType == NodeObjectTypeId);
             }
             else
             {
                 sql.Select("COUNT(*)")
-                    .From<NodeDto>()
-                    .InnerJoin<ContentDto>()
-                    .On<NodeDto, ContentDto>(left => left.NodeId, right => right.NodeId)
-                    .InnerJoin<ContentTypeDto>()
-                    .On<ContentTypeDto, ContentDto>(left => left.NodeId, right => right.ContentTypeId)
-                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
-                    .Where<ContentTypeDto>(x => x.Alias == contentTypeAlias);
+                    .From<NodeDto>(SqlSyntax)
+                    .InnerJoin<ContentDto>(SqlSyntax)
+                    .On<NodeDto, ContentDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
+                    .InnerJoin<ContentTypeDto>(SqlSyntax)
+                    .On<ContentTypeDto, ContentDto>(SqlSyntax, left => left.NodeId, right => right.ContentTypeId)
+                    .Where<NodeDto>(SqlSyntax, x => x.NodeObjectType == NodeObjectTypeId)
+                    .Where<ContentTypeDto>(SqlSyntax, x => x.Alias == contentTypeAlias);
             }
 
             return Database.ExecuteScalar<int>(sql);
@@ -295,7 +295,7 @@ namespace Umbraco.Core.Persistence.Repositories
             // Get base query
             var sqlBase = GetBaseQuery(false);
 
-            if (query == null) query = new Query<TEntity>();
+            if (query == null) query = Query;
             var translator = new SqlTranslator<TEntity>(sqlBase, query);
             var sqlQuery = translator.Translate();
             
diff --git a/src/Umbraco.Core/Persistence/RepositoryFactory.cs b/src/Umbraco.Core/Persistence/RepositoryFactory.cs
index 139615874e..3661626ffd 100644
--- a/src/Umbraco.Core/Persistence/RepositoryFactory.cs
+++ b/src/Umbraco.Core/Persistence/RepositoryFactory.cs
@@ -22,6 +22,12 @@ namespace Umbraco.Core.Persistence
         private readonly IUmbracoSettingsSection _settings;
         private readonly IMappingResolver _mappingResolver;
 
+        public ISqlSyntaxProvider SqlSyntax
+        {
+            get { return _sqlSyntax; }
+        }
+
+
         #region Ctors
 
         public RepositoryFactory(CacheHelper cacheHelper, ILogger logger, ISqlSyntaxProvider sqlSyntax, IUmbracoSettingsSection settings, IMappingResolver mappingResolver)
@@ -80,7 +86,7 @@ namespace Umbraco.Core.Persistence
         {
             return new TagRepository(
                 uow,
-                _cacheHelper, _logger, _sqlSyntax);
+                _cacheHelper, _logger, _sqlSyntax, _mappingResolver);
         }
 
         public virtual IContentRepository CreateContentRepository(IDatabaseUnitOfWork uow)
@@ -199,7 +205,7 @@ namespace Umbraco.Core.Persistence
                 _logger, _sqlSyntax,
                 new PhysicalFileSystem(SystemDirectories.Masterpages),
                 new PhysicalFileSystem(SystemDirectories.MvcViews),
-                _settings.Templates);
+                _settings.Templates, _mappingResolver);
         }
 
         public virtual IMigrationEntryRepository CreateMigrationEntryRepository(IDatabaseUnitOfWork uow)
diff --git a/src/Umbraco.Core/Services/ContentTypeService.cs b/src/Umbraco.Core/Services/ContentTypeService.cs
index 0406636116..97fbfbff2e 100644
--- a/src/Umbraco.Core/Services/ContentTypeService.cs
+++ b/src/Umbraco.Core/Services/ContentTypeService.cs
@@ -382,7 +382,7 @@ namespace Umbraco.Core.Services
             {
                 var found = GetContentType(id);
                 if (found == null) return Enumerable.Empty<IContentType>();
-                var query = QueryFactory.Create<IContentType>().Where(x => x.ParentId == found.Id);
+                var query = repository.Query.Where(x => x.ParentId == found.Id);
                 var contentTypes = repository.GetByQuery(query);
                 return contentTypes;
             }
@@ -414,7 +414,7 @@ namespace Umbraco.Core.Services
             {
                 var found = GetContentType(id);
                 if (found == null) return false;
-                var query = QueryFactory.Create<IContentType>().Where(x => x.ParentId == found.Id);
+                var query = repository.Query.Where(x => x.ParentId == found.Id);
                 int count = repository.Count(query);
                 return count > 0;
             }
@@ -766,7 +766,7 @@ namespace Umbraco.Core.Services
             {
                 var found = GetMediaType(id);
                 if (found == null) return Enumerable.Empty<IMediaType>();
-                var query = QueryFactory.Create<IMediaType>().Where(x => x.ParentId == found.Id);
+                var query = repository.Query.Where(x => x.ParentId == found.Id);
                 var contentTypes = repository.GetByQuery(query);
                 return contentTypes;
             }
@@ -798,7 +798,7 @@ namespace Umbraco.Core.Services
             {
                 var found = GetMediaType(id);
                 if (found == null) return false;
-                var query = QueryFactory.Create<IMediaType>().Where(x => x.ParentId == found.Id);
+                var query = repository.Query.Where(x => x.ParentId == found.Id);
                 int count = repository.Count(query);
                 return count > 0;
             }
diff --git a/src/Umbraco.Core/Services/EntityService.cs b/src/Umbraco.Core/Services/EntityService.cs
index 60334293be..4314308f41 100644
--- a/src/Umbraco.Core/Services/EntityService.cs
+++ b/src/Umbraco.Core/Services/EntityService.cs
@@ -87,8 +87,8 @@ namespace Umbraco.Core.Services
                         case UmbracoObjectTypes.DocumentTypeContainer:
                             return uow.Database.ExecuteScalar<int?>(
                                 new Sql().Select("id")
-                                    .From<NodeDto>(SqlSyntax)
-                                    .Where<NodeDto>(SqlSyntax, dto => dto.UniqueId == key));
+                                    .From<NodeDto>(RepositoryFactory.SqlSyntax)
+                                    .Where<NodeDto>(RepositoryFactory.SqlSyntax, dto => dto.UniqueId == key));
                         case UmbracoObjectTypes.RecycleBin:
                         case UmbracoObjectTypes.Stylesheet:
                         case UmbracoObjectTypes.MemberGroup:
@@ -128,8 +128,8 @@ namespace Umbraco.Core.Services
                         case UmbracoObjectTypes.DataType:
                             return uow.Database.ExecuteScalar<Guid?>(
                                 new Sql().Select("uniqueID")
-                                    .From<NodeDto>(SqlSyntax)
-                                    .Where<NodeDto>(SqlSyntax, dto => dto.NodeId == id));
+                                    .From<NodeDto>(RepositoryFactory.SqlSyntax)
+                                    .Where<NodeDto>(RepositoryFactory.SqlSyntax, dto => dto.NodeId == id));
                         case UmbracoObjectTypes.RecycleBin:
                         case UmbracoObjectTypes.Stylesheet:
                         case UmbracoObjectTypes.MemberGroup:
@@ -323,7 +323,7 @@ namespace Umbraco.Core.Services
         {
             using (var repository = RepositoryFactory.CreateEntityRepository(UowProvider.GetUnitOfWork()))
             {
-                var query = QueryFactory.Create<IUmbracoEntity>().Where(x => x.ParentId == parentId);
+                var query = repository.Query.Where(x => x.ParentId == parentId);
                 var contents = repository.GetByQuery(query);
 
                 return contents;
@@ -341,7 +341,7 @@ namespace Umbraco.Core.Services
             var objectTypeId = umbracoObjectType.GetGuid();
             using (var repository = RepositoryFactory.CreateEntityRepository(UowProvider.GetUnitOfWork()))
             {
-                var query = QueryFactory.Create<IUmbracoEntity>().Where(x => x.ParentId == parentId);
+                var query = repository.Query.Where(x => x.ParentId == parentId);
                 var contents = repository.GetByQuery(query, objectTypeId);
 
                 return contents;
@@ -359,7 +359,7 @@ namespace Umbraco.Core.Services
             {
                 var entity = repository.Get(id);
                 var pathMatch = entity.Path + ",";
-                var query = QueryFactory.Create<IUmbracoEntity>().Where(x => x.Path.StartsWith(pathMatch) && x.Id != id);
+                var query = repository.Query.Where(x => x.Path.StartsWith(pathMatch) && x.Id != id);
                 var entities = repository.GetByQuery(query);
 
                 return entities;
@@ -378,7 +378,7 @@ namespace Umbraco.Core.Services
             using (var repository = RepositoryFactory.CreateEntityRepository(UowProvider.GetUnitOfWork()))
             {
                 var entity = repository.Get(id);
-                var query = QueryFactory.Create<IUmbracoEntity>().Where(x => x.Path.StartsWith(entity.Path) && x.Id != id);
+                var query = repository.Query.Where(x => x.Path.StartsWith(entity.Path) && x.Id != id);
                 var entities = repository.GetByQuery(query, objectTypeId);
 
                 return entities;
@@ -395,7 +395,7 @@ namespace Umbraco.Core.Services
             var objectTypeId = umbracoObjectType.GetGuid();
             using (var repository = RepositoryFactory.CreateEntityRepository(UowProvider.GetUnitOfWork()))
             {
-                var query = QueryFactory.Create<IUmbracoEntity>().Where(x => x.ParentId == -1);
+                var query = repository.Query.Where(x => x.ParentId == -1);
                 var entities = repository.GetByQuery(query, objectTypeId);
 
                 return entities;
@@ -492,7 +492,7 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                var sql = new Sql().Select("nodeObjectType").From<NodeDto>(SqlSyntax).Where<NodeDto>(SqlSyntax, x => x.NodeId == id);
+                var sql = new Sql().Select("nodeObjectType").From<NodeDto>(RepositoryFactory.SqlSyntax).Where<NodeDto>(RepositoryFactory.SqlSyntax, x => x.NodeId == id);
                 var nodeObjectTypeId = uow.Database.ExecuteScalar<Guid>(sql);
                 var objectTypeId = nodeObjectTypeId;
                 return UmbracoObjectTypesExtensions.GetUmbracoObjectType(objectTypeId);
@@ -508,7 +508,7 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.GetUnitOfWork())
             {
-                var sql = new Sql().Select("nodeObjectType").From<NodeDto>(SqlSyntax).Where<NodeDto>(SqlSyntax, x => x.UniqueId == key);
+                var sql = new Sql().Select("nodeObjectType").From<NodeDto>(RepositoryFactory.SqlSyntax).Where<NodeDto>(RepositoryFactory.SqlSyntax, x => x.UniqueId == key);
                 var nodeObjectTypeId = uow.Database.ExecuteScalar<Guid>(sql);
                 var objectTypeId = nodeObjectTypeId;
                 return UmbracoObjectTypesExtensions.GetUmbracoObjectType(objectTypeId);
diff --git a/src/Umbraco.Core/Services/FileService.cs b/src/Umbraco.Core/Services/FileService.cs
index 31d5f48c3b..c93df1acfa 100644
--- a/src/Umbraco.Core/Services/FileService.cs
+++ b/src/Umbraco.Core/Services/FileService.cs
@@ -317,7 +317,7 @@ namespace Umbraco.Core.Services
         {
             using (var repository = _repositoryFactory.CreateTemplateRepository(_dataUowProvider.GetUnitOfWork()))
             {
-                var query = _repositoryFactory.QueryFactory.Create<ITemplate>().Where(x => x.Key == id);
+                var query = repository.Query.Where(x => x.Key == id);
                 return repository.GetByQuery(query).SingleOrDefault();
             }
         }
diff --git a/src/Umbraco.Core/Services/LocalizationService.cs b/src/Umbraco.Core/Services/LocalizationService.cs
index be0ba6f9bb..4fa349d9c6 100644
--- a/src/Umbraco.Core/Services/LocalizationService.cs
+++ b/src/Umbraco.Core/Services/LocalizationService.cs
@@ -148,7 +148,7 @@ namespace Umbraco.Core.Services
         {
             using (var repository = RepositoryFactory.CreateDictionaryRepository(UowProvider.GetUnitOfWork()))
             {
-                var query = QueryFactory.Create<IDictionaryItem>().Where(x => x.ParentId == parentId);
+                var query = repository.Query.Where(x => x.ParentId == parentId);
                 var items = repository.GetByQuery(query);
 
                 return items;
@@ -176,7 +176,7 @@ namespace Umbraco.Core.Services
         {
             using (var repository = RepositoryFactory.CreateDictionaryRepository(UowProvider.GetUnitOfWork()))
             {
-                var query = repository.Query.Create<IDictionaryItem>().Where(x => x.ParentId == null);
+                var query = repository.QueryFactory.Create<IDictionaryItem>().Where(x => x.ParentId == null);
                 var items = repository.GetByQuery(query);
 
                 return items;
diff --git a/src/Umbraco.Core/Services/UserService.cs b/src/Umbraco.Core/Services/UserService.cs
index 11fba92013..d8fe07c46c 100644
--- a/src/Umbraco.Core/Services/UserService.cs
+++ b/src/Umbraco.Core/Services/UserService.cs
@@ -202,7 +202,7 @@ namespace Umbraco.Core.Services
         {
             using (var repository = RepositoryFactory.CreateUserRepository(UowProvider.GetUnitOfWork()))
             {
-                var query = QueryFactory.Create<IUser>().Where(x => x.Email.Equals(email));
+                var query = repository.Query.Where(x => x.Email.Equals(email));
                 var user = repository.GetByQuery(query).FirstOrDefault();
 
                 return user;
@@ -218,7 +218,7 @@ namespace Umbraco.Core.Services
         {
             using (var repository = RepositoryFactory.CreateUserRepository(UowProvider.GetUnitOfWork()))
             {
-                var query = QueryFactory.Create<IUser>().Where(x => x.Username.Equals(username));
+                var query = repository.Query.Where(x => x.Username.Equals(username));
                 var user = repository.GetByQuery(query).FirstOrDefault();
                 return user;
             }
@@ -376,7 +376,7 @@ namespace Umbraco.Core.Services
             var uow = UowProvider.GetUnitOfWork();
             using (var repository = RepositoryFactory.CreateUserRepository(uow))
             {
-                var query = QueryFactory.Create<IUser>();
+                var query = repository.Query;
 
                 switch (matchType)
                 {
@@ -417,7 +417,7 @@ namespace Umbraco.Core.Services
             var uow = UowProvider.GetUnitOfWork();
             using (var repository = RepositoryFactory.CreateUserRepository(uow))
             {
-                var query = QueryFactory.Create<IUser>();
+                var query = repository.Query;
 
                 switch (matchType)
                 {
@@ -463,7 +463,7 @@ namespace Umbraco.Core.Services
                 switch (countType)
                 {
                     case MemberCountType.All:
-                        query = QueryFactory.Create<IUser>();
+                        query = repository.Query;
                         return repository.Count(query);
                     case MemberCountType.Online:
                         throw new NotImplementedException();
@@ -476,12 +476,12 @@ namespace Umbraco.Core.Services
                         //return repository.GetCountByQuery(query);
                     case MemberCountType.LockedOut:
                         query =
-                            QueryFactory.Create<IUser>().Where(
+                            repository.Query.Where(
                                 x => x.IsLockedOut);
                         return repository.GetCountByQuery(query);
                     case MemberCountType.Approved:
                         query =
-                            QueryFactory.Create<IUser>().Where(
+                            repository.Query.Where(
                                 x => x.IsApproved);
                         return repository.GetCountByQuery(query);
                     default:
@@ -599,7 +599,7 @@ namespace Umbraco.Core.Services
         {
             using (var repository = RepositoryFactory.CreateUserTypeRepository(UowProvider.GetUnitOfWork()))
             {
-                var query = QueryFactory.Create<IUserType>().Where(x => x.Alias == alias);
+                var query = repository.QueryFactory.Create<IUserType>().Where(x => x.Alias == alias);
                 var contents = repository.GetByQuery(query);
                 return contents.SingleOrDefault();
             }
@@ -627,7 +627,7 @@ namespace Umbraco.Core.Services
         {
             using (var repository = RepositoryFactory.CreateUserTypeRepository(UowProvider.GetUnitOfWork()))
             {
-                var query = QueryFactory.Create<IUserType>().Where(x => x.Name == name);
+                var query = repository.QueryFactory.Create<IUserType>().Where(x => x.Name == name);
                 var contents = repository.GetByQuery(query);
                 return contents.SingleOrDefault();
             }
diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs
index 39f4a57b32..675ea185ef 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs
@@ -9,7 +9,6 @@ using Umbraco.Core.PropertyEditors;
 using Umbraco.Web.Models.ContentEditing;
 using System.Collections.Generic;
 using AutoMapper.Internal;
-using Property = umbraco.NodeFactory.Property;
 
 namespace Umbraco.Web.Models.Mapping
 {
diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
index 3697879570..b6d65ec36a 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs
index 5f2c63b815..ec8c2c8c82 100644
--- a/src/Umbraco.Web/WebBootManager.cs
+++ b/src/Umbraco.Web/WebBootManager.cs
@@ -8,9 +8,11 @@ using System.Web;
 using System.Web.Configuration;
 using System.Web.Http;
 using System.Web.Http.Dispatcher;
-
+using System.Web.Mvc;
 using System.Web.Routing;
-
+using ClientDependency.Core.Config;
+using Examine;
+using Examine.Config;
 using umbraco;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
diff --git a/src/umbraco.cms/businesslogic/Dictionary.cs b/src/umbraco.cms/businesslogic/Dictionary.cs
index 8e76122175..676d3a12df 100644
--- a/src/umbraco.cms/businesslogic/Dictionary.cs
+++ b/src/umbraco.cms/businesslogic/Dictionary.cs
@@ -90,13 +90,7 @@ namespace umbraco.cms.businesslogic
                     throw new ArgumentException("No id " + id + " exists in dictionary");
                 }
             }
-
-            [Obsolete("This is no longer used and will be removed from the codebase in future versions")]
-            public bool IsTopMostItem()
-            {
-                return _dictionaryItem.ParentId.HasValue == false;
-            }
-
+            
             /// <summary>
             /// Returns the parent.
             /// </summary>