diff --git a/Mimeo.DynamicUI.Blazor/Forms/ODataGrid.razor.cs b/Mimeo.DynamicUI.Blazor/Forms/ODataGrid.razor.cs
index f668fbf..11a7c2a 100644
--- a/Mimeo.DynamicUI.Blazor/Forms/ODataGrid.razor.cs
+++ b/Mimeo.DynamicUI.Blazor/Forms/ODataGrid.razor.cs
@@ -93,6 +93,9 @@ public partial class ODataGrid
     [Parameter]
     public Dictionary<string, Type> CustomFormFieldTypes { get; set; } = [];
 
+    [Parameter]
+    public EventCallback<DataQuery> OnQueryChanged { get; set; }
+
     private bool CanCreate => (Service?.SupportsCreate ?? false) && AllowCreate;
     private bool CanUpdate => (Service?.SupportsUpdate ?? false) && AllowUpdate;
     private bool CanCopy => (Service?.SupportsCopy ?? false) && AllowCopy;
@@ -248,6 +251,8 @@ await taskRunningService.Run(async () =>
         });
 
         previousQuery = query.Clone();
+
+        await OnQueryChanged.InvokeAsync(previousQuery);
     }
 
     private async Task LoadSearchSuggestions(LoadDataArgs args)
diff --git a/Mimeo.DynamicUI/Data/DataPageEnumerable.cs b/Mimeo.DynamicUI/Data/DataPageEnumerable.cs
index a932ef6..cf85ef6 100644
--- a/Mimeo.DynamicUI/Data/DataPageEnumerable.cs
+++ b/Mimeo.DynamicUI/Data/DataPageEnumerable.cs
@@ -13,8 +13,9 @@ private static PageQuery<T> CreateQuery(DataQuery args, Func<DataQuery, Task<Dat
                 var skip = continuationToken as int? ?? 0;
                 var newArgs = new DataQuery
                 {
-                    Filters = args.Filters,
+                    Filter = args.Filter,
                     Sorts = args.Sorts,
+                    SearchText = args.SearchText,
                     Skip = skip,
                     Top = args.Top ?? 250
                 };
diff --git a/Mimeo.DynamicUI/Data/DataQuery.cs b/Mimeo.DynamicUI/Data/DataQuery.cs
index 84188b7..c2a06f1 100644
--- a/Mimeo.DynamicUI/Data/DataQuery.cs
+++ b/Mimeo.DynamicUI/Data/DataQuery.cs
@@ -1,4 +1,4 @@
-namespace Mimeo.DynamicUI.Data
+namespace Mimeo.DynamicUI.Data
 {
     public class DataQuery
     {
@@ -39,7 +39,7 @@ public DataQuery Clone()
                 Skip = this.Skip,
                 Top = this.Top,
                 SearchText = this.SearchText,
-                Filters = this.Filters.Select(f => f.Clone()).ToList(),
+                Filter = (DataQueryFilterGroup)this.Filter.Clone(),
                 Sorts = this.Sorts.Select(f => f with { } /* clone a record*/).ToList()
             };
         }
@@ -54,13 +54,13 @@ public override bool Equals(object? obj)
             return this.Skip == other.Skip
                 && this.Top == other.Top
                 && this.SearchText == other.SearchText
-                && this.Filters.SequenceEqual(other.Filters)
+                && this.Filter.Equals(other.Filter)
                 && this.Sorts.SequenceEqual(other.Sorts);
         }
 
         public override int GetHashCode()
         {
-            return HashCode.Combine(Skip, Top, SearchText, Filters, Sorts);
+            return HashCode.Combine(Skip, Top, SearchText, Filter, Sorts);
         }
 
         public static bool operator ==(DataQuery? left, DataQuery? right)
diff --git a/Mimeo.DynamicUI/Data/DataQueryFilterGroup.cs b/Mimeo.DynamicUI/Data/DataQueryFilterGroup.cs
index f515a51..824e6b0 100644
--- a/Mimeo.DynamicUI/Data/DataQueryFilterGroup.cs
+++ b/Mimeo.DynamicUI/Data/DataQueryFilterGroup.cs
@@ -22,7 +22,8 @@ public override DataQueryFilterBase Clone()
         {
             return new DataQueryFilterGroup
             {
-                Filters = Filters.Select(f => f.Clone()).ToList()
+                Filters = Filters.Select(f => f.Clone()).ToList(),
+                FiltersConjunction = FiltersConjunction
             };
         }