diff --git a/src/XperienceCommunity.DataContext/ContentQueryExecutor.cs b/src/XperienceCommunity.DataContext/ContentQueryExecutor.cs
index 4f5aece..f15ec25 100644
--- a/src/XperienceCommunity.DataContext/ContentQueryExecutor.cs
+++ b/src/XperienceCommunity.DataContext/ContentQueryExecutor.cs
@@ -40,7 +40,7 @@ public async Task<IEnumerable<T>> ExecuteQueryAsync(ContentItemQueryBuilder quer
                 {
                     foreach (var processor in _processors.OrderBy(x=> x.Order))
                     {
-                        await processor.ProcessAsync(result);
+                        await processor.ProcessAsync(result, cancellationToken);
                     }
                 }
 
diff --git a/src/XperienceCommunity.DataContext/PageContentQueryExecutor.cs b/src/XperienceCommunity.DataContext/PageContentQueryExecutor.cs
index 98a4241..7c82747 100644
--- a/src/XperienceCommunity.DataContext/PageContentQueryExecutor.cs
+++ b/src/XperienceCommunity.DataContext/PageContentQueryExecutor.cs
@@ -1,4 +1,5 @@
 using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
 using CMS.ContentEngine;
 using CMS.Websites;
 using Microsoft.Extensions.Logging;
@@ -22,6 +23,7 @@ public PageContentQueryExecutor(ILogger<PageContentQueryExecutor<T>> logger,
             _processors = processors?.ToImmutableList();
         }
 
+        [return: NotNull]
         public async Task<IEnumerable<T>> ExecuteQueryAsync(ContentItemQueryBuilder queryBuilder,
             ContentQueryExecutionOptions queryOptions, CancellationToken cancellationToken)
         {
@@ -39,11 +41,11 @@ public async Task<IEnumerable<T>> ExecuteQueryAsync(ContentItemQueryBuilder quer
                 {
                     foreach (var processor in _processors.OrderBy(x => x.Order))
                     {
-                        await processor.ProcessAsync(result);
+                        await processor.ProcessAsync(result, cancellationToken);
                     }
                 }
 
-                return results;
+                return results ?? [];
             }
             catch (Exception ex)
             {