diff --git a/Oqtane.Server/Infrastructure/Jobs/SiteTaskJob.cs b/Oqtane.Server/Infrastructure/Jobs/SiteTaskJob.cs
index 5e5c7207..e82ba007 100644
--- a/Oqtane.Server/Infrastructure/Jobs/SiteTaskJob.cs
+++ b/Oqtane.Server/Infrastructure/Jobs/SiteTaskJob.cs
@@ -21,18 +21,20 @@ namespace Oqtane.Infrastructure
         {
             var log = "";
 
+            // resolve services
             var tenantManager = provider.GetRequiredService<ITenantManager>();
+            var siteRepository = provider.GetRequiredService<ISiteRepository>();
+            var siteTaskRepository = provider.GetRequiredService<ISiteTaskRepository>();
+
             var tenant = tenantManager.GetTenant();
 
             // iterate through sites for current tenant
-            var siteRepository = provider.GetRequiredService<ISiteRepository>();
             var sites = siteRepository.GetSites().ToList();
             foreach (var site in sites.Where(item => !item.IsDeleted))
             {
                 log += $"Processing Site: {site.Name}<br />";
 
                 // get incomplete tasks for site
-                var siteTaskRepository = provider.GetRequiredService<ISiteTaskRepository>();
                 var tasks = siteTaskRepository.GetSiteTasks(site.SiteId).ToList();
                 if (tasks != null && tasks.Any())
                 {
diff --git a/Oqtane.Server/Infrastructure/SiteTasks/GlobalReplaceTask.cs b/Oqtane.Server/Infrastructure/SiteTasks/GlobalReplaceTask.cs
index 008fd9a8..14b11ae4 100644
--- a/Oqtane.Server/Infrastructure/SiteTasks/GlobalReplaceTask.cs
+++ b/Oqtane.Server/Infrastructure/SiteTasks/GlobalReplaceTask.cs
@@ -110,7 +110,7 @@ namespace Oqtane.Infrastructure
                         if (changed && globalReplace.Modules)
                         {
                             pageModuleRepository.UpdatePageModule(pageModule);
-                            log += $"Module Updated: {pageModule.Title} - /{page.Path}<br />";
+                            log += $"Module Updated: {pageModule.Title} Page: /{page.Path}<br />";
                         }
 
                         // module content
@@ -127,7 +127,7 @@ namespace Oqtane.Infrastructure
                                     {
                                         moduleContent = moduleContent.Replace(find, replace, comparisonType);
                                         ((IPortable)moduleObject).ImportModule(pageModule.Module, moduleContent, pageModule.Module.ModuleDefinition.Version);
-                                        log += $"Module Content Updated: {pageModule.Title} - /{page.Path}<br />";
+                                        log += $"Module Content Updated: {pageModule.Title} Page: /{page.Path}<br />";
                                     }
                                 }
                                 catch (Exception ex)
diff --git a/Oqtane.Server/Repository/SiteTaskRepository.cs b/Oqtane.Server/Repository/SiteTaskRepository.cs
index 4d927c32..87ea15dc 100644
--- a/Oqtane.Server/Repository/SiteTaskRepository.cs
+++ b/Oqtane.Server/Repository/SiteTaskRepository.cs
@@ -28,7 +28,8 @@ namespace Oqtane.Repository
         public IEnumerable<SiteTask> GetSiteTasks(int siteId)
         {
             using var db = _dbContextFactory.CreateDbContext();
-            return db.SiteTask.Where(item => item.SiteId == siteId && !item.IsCompleted).OrderBy(item => item.CreatedOn);
+            return db.SiteTask.Where(item => item.SiteId == siteId && !item.IsCompleted)
+                .OrderBy(item => item.CreatedOn).ToList();
         }
 
         public SiteTask GetSiteTask(int siteTaskId)