diff --git a/APIs/src/EpiServer.ContentGraph/Api/Filters/AndFilter.cs b/APIs/src/EpiServer.ContentGraph/Api/Filters/AndFilter.cs
index f859c852..3ec4a826 100644
--- a/APIs/src/EpiServer.ContentGraph/Api/Filters/AndFilter.cs
+++ b/APIs/src/EpiServer.ContentGraph/Api/Filters/AndFilter.cs
@@ -37,6 +37,7 @@ public AndFilter(Expression<Func<T, int>> fieldSelector, NumericFilterOperators
             And(fieldSelector, filterOperators);
         }
         #endregion
+        #region Base type
         public AndFilter<T> And(Expression<Func<T, string>> fieldSelector, IFilterOperator filterOperator)
         {
             fieldSelector.ValidateNotNullArgument("fieldSelector");
@@ -61,6 +62,12 @@ public AndFilter<T> And(Expression<Func<T, double?>> fieldSelector, IFilterOpera
             And(fieldSelector.GetFieldPath(), filterOperator);
             return this;
         }
+        public AndFilter<T> And(Expression<Func<T, float?>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            And(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
         public AndFilter<T> And(Expression<Func<T, int>> fieldSelector, IFilterOperator filterOperator)
         {
             fieldSelector.ValidateNotNullArgument("fieldSelector");
@@ -73,6 +80,64 @@ public AndFilter<T> And(Expression<Func<T, bool>> fieldSelector, IFilterOperator
             And(fieldSelector.GetFieldPath(), filterOperator);
             return this;
         }
+        #endregion
+        #region Enumerable
+        public AndFilter<T> And(Expression<Func<T, IEnumerable<string>>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            And(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
+        public AndFilter(Expression<Func<T, IEnumerable<string>>> fieldSelector, StringFilterOperators filterOperators)
+        {
+            And(fieldSelector, filterOperators);
+        }
+        public AndFilter<T> And(Expression<Func<T, IEnumerable<bool>>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            And(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
+        public AndFilter<T> And(Expression<Func<T, IEnumerable<int>>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            And(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
+        public AndFilter<T> And(Expression<Func<T, IEnumerable<double>>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            And(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
+        public AndFilter<T> And(Expression<Func<T, IEnumerable<long>>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            And(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
+        public AndFilter<T> And(Expression<Func<T, IEnumerable<float>>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            And(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
+        public AndFilter<T> And(Expression<Func<T, IEnumerable<DateTime>>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            And(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
+        public AndFilter<T> And<TField>(Expression<Func<T, IEnumerable<TField>>> rootSelector,
+        Expression<Func<TField, object>> fieldSelector,
+        IFilterOperator filterOperator)
+        {
+            rootSelector.ValidateNotNullArgument("rootSelector");
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            And($"{rootSelector.GetFieldPath()}.{fieldSelector.GetFieldPath()}", filterOperator);
+            return this;
+        }
+        #endregion
         private AndFilter<T> And(Expression<Func<T, Filter>> fieldSelector)
         {
             fieldSelector.ValidateNotNullArgument("fieldSelector");
diff --git a/APIs/src/EpiServer.ContentGraph/Api/Filters/NotFilter.cs b/APIs/src/EpiServer.ContentGraph/Api/Filters/NotFilter.cs
index 8549b1ed..daa83dbb 100644
--- a/APIs/src/EpiServer.ContentGraph/Api/Filters/NotFilter.cs
+++ b/APIs/src/EpiServer.ContentGraph/Api/Filters/NotFilter.cs
@@ -54,6 +54,12 @@ public NotFilter<T> Not(Expression<Func<T, double?>> fieldSelector, IFilterOpera
             Not(fieldSelector.GetFieldPath(), filterOperator);
             return this;
         }
+        public NotFilter<T> Not(Expression<Func<T, float?>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            Not(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
         public NotFilter<T> Not(Expression<Func<T, DateTime?>> fieldSelector, IFilterOperator filterOperator)
         {
             fieldSelector.ValidateNotNullArgument("fieldSelector");
@@ -85,6 +91,63 @@ public NotFilter<T> Not(params Expression<Func<T, Filter>>[] fieldSelectors)
             }
             return this;
         }
+        #region Enumerable
+        public NotFilter<T> Not(Expression<Func<T, IEnumerable<string>>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            Not(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
+        public NotFilter(Expression<Func<T, IEnumerable<string>>> fieldSelector, StringFilterOperators filterOperators)
+        {
+            Not(fieldSelector, filterOperators);
+        }
+        public NotFilter<T> Not(Expression<Func<T, IEnumerable<bool>>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            Not(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
+        public NotFilter<T> Not(Expression<Func<T, IEnumerable<int>>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            Not(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
+        public NotFilter<T> Not(Expression<Func<T, IEnumerable<double>>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            Not(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
+        public NotFilter<T> Not(Expression<Func<T, IEnumerable<long>>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            Not(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
+        public NotFilter<T> Not(Expression<Func<T, IEnumerable<float>>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            Not(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
+        public NotFilter<T> Not(Expression<Func<T, IEnumerable<DateTime>>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            Not(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
+        public NotFilter<T> Not<TField>(Expression<Func<T, IEnumerable<TField>>> rootSelector,
+        Expression<Func<TField, object>> fieldSelector,
+        IFilterOperator filterOperator)
+        {
+            rootSelector.ValidateNotNullArgument("rootSelector");
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            Not($"{rootSelector.GetFieldPath()}.{fieldSelector.GetFieldPath()}", filterOperator);
+            return this;
+        }
+        #endregion
     }
 
     public class NotFilter : Filter
diff --git a/APIs/src/EpiServer.ContentGraph/Api/Filters/NumericFilterOperators.cs b/APIs/src/EpiServer.ContentGraph/Api/Filters/NumericFilterOperators.cs
index 8be5df0e..efa9955d 100644
--- a/APIs/src/EpiServer.ContentGraph/Api/Filters/NumericFilterOperators.cs
+++ b/APIs/src/EpiServer.ContentGraph/Api/Filters/NumericFilterOperators.cs
@@ -71,14 +71,6 @@ public NumericFilterOperators InRange(int? from, int? to)
             }
             return this;
         }
-        public NumericFilterOperators InRanges(params (int? from, int? to)[] ranges)
-        {
-            foreach (var range in ranges)
-            {
-                InRange(range.from, range.to);
-            }
-            return this;
-        }
 
         public NumericFilterOperators Eq(float value)
         {
@@ -164,21 +156,5 @@ public NumericFilterOperators InRange(double? from, double? to)
             }
             return this;
         }
-        public NumericFilterOperators InRanges(params (float? from, float? to)[] ranges)
-        {
-            foreach (var range in ranges)
-            {
-                InRange(range.from, range.to);
-            }
-            return this;
-        }
-        public NumericFilterOperators InRanges(params (double? from, double? to)[] ranges)
-        {
-            foreach (var range in ranges)
-            {
-                InRange(range.from, range.to);
-            }
-            return this;
-        }
     }
 }
diff --git a/APIs/src/EpiServer.ContentGraph/Api/Filters/OrFilter.cs b/APIs/src/EpiServer.ContentGraph/Api/Filters/OrFilter.cs
index f8196973..2a54e1a9 100644
--- a/APIs/src/EpiServer.ContentGraph/Api/Filters/OrFilter.cs
+++ b/APIs/src/EpiServer.ContentGraph/Api/Filters/OrFilter.cs
@@ -54,6 +54,12 @@ public OrFilter<T> Or(Expression<Func<T, long?>> fieldSelector, IFilterOperator
             Or(fieldSelector.GetFieldPath(), filterOperator);
             return this;
         }
+        public OrFilter<T> Not(Expression<Func<T, float?>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            Or(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
         public OrFilter<T> Or(Expression<Func<T, double?>> fieldSelector, IFilterOperator filterOperator)
         {
             fieldSelector.ValidateNotNullArgument("fieldSelector");
@@ -92,6 +98,63 @@ public OrFilter<T> Or(params Expression<Func<T, Filter>>[] fieldSelectors)
             }
             return this;
         }
+        #region Enumerable
+        public OrFilter<T> Or(Expression<Func<T, IEnumerable<string>>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            Or(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
+        public OrFilter(Expression<Func<T, IEnumerable<string>>> fieldSelector, StringFilterOperators filterOperators)
+        {
+            Or(fieldSelector, filterOperators);
+        }
+        public OrFilter<T> Or(Expression<Func<T, IEnumerable<bool>>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            Or(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
+        public OrFilter<T> Or(Expression<Func<T, IEnumerable<int>>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            Or(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
+        public OrFilter<T> Or(Expression<Func<T, IEnumerable<double>>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            Or(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
+        public OrFilter<T> Or(Expression<Func<T, IEnumerable<long>>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            Or(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
+        public OrFilter<T> Or(Expression<Func<T, IEnumerable<float>>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            Or(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
+        public OrFilter<T> Or(Expression<Func<T, IEnumerable<DateTime>>> fieldSelector, IFilterOperator filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            Or(fieldSelector.GetFieldPath(), filterOperator);
+            return this;
+        }
+        public OrFilter<T> Or<TField>(Expression<Func<T, IEnumerable<TField>>> rootSelector,
+        Expression<Func<TField, object>> fieldSelector,
+        IFilterOperator filterOperator)
+        {
+            rootSelector.ValidateNotNullArgument("rootSelector");
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            Or($"{rootSelector.GetFieldPath()}.{fieldSelector.GetFieldPath()}", filterOperator);
+            return this;
+        }
+        #endregion
     }
 
     public class OrFilter : Filter
diff --git a/APIs/src/EpiServer.ContentGraph/Api/Querying/FragmentBuilder.cs b/APIs/src/EpiServer.ContentGraph/Api/Querying/FragmentBuilder.cs
index a65c7f7f..30777835 100644
--- a/APIs/src/EpiServer.ContentGraph/Api/Querying/FragmentBuilder.cs
+++ b/APIs/src/EpiServer.ContentGraph/Api/Querying/FragmentBuilder.cs
@@ -67,7 +67,7 @@ public class FragmentBuilder<T> : FragmentBuilder
         public FragmentBuilder() : base() { }
         public FragmentBuilder(string name)
         {
-            _query.OperationName = name;
+            base.OperationName(name);
         }
         private FragmentBuilder<T> Field(Expression<Func<T, object>> fieldSelector)
         {
diff --git a/APIs/src/EpiServer.ContentGraph/Api/Querying/TypeQueryBuilder.cs b/APIs/src/EpiServer.ContentGraph/Api/Querying/TypeQueryBuilder.cs
index 7df0e5f1..be3e4d0b 100644
--- a/APIs/src/EpiServer.ContentGraph/Api/Querying/TypeQueryBuilder.cs
+++ b/APIs/src/EpiServer.ContentGraph/Api/Querying/TypeQueryBuilder.cs
@@ -115,6 +115,27 @@ public TypeQueryBuilder<T> Fields(params Expression<Func<T, object>>[] fieldSele
             }
             return this;
         }
+        /// <summary>
+        /// Select properties of an IEnumerable of <typeparamref name="TField"/>
+        /// </summary>
+        /// <typeparam name="TField"></typeparam>
+        /// <param name="enumSelector">IEnumerable property of <typeparamref name="T"/></param>
+        /// <param name="fieldSelectors">Fields of type <typeparamref name="TField"/></param>
+        /// <returns></returns>
+        public TypeQueryBuilder<T> NestedFields<TField>(Expression<Func<T, IEnumerable<TField>>> enumSelector, params Expression<Func<TField, object>>[] fieldSelectors )
+        {
+            enumSelector.ValidateNotNullArgument("fieldSelector");
+            fieldSelectors.ValidateNotNullArgument("fields");
+            var enumPath = enumSelector.GetFieldPath();
+            string fields = string.Empty;
+            foreach (var fieldSelector in fieldSelectors)
+            {
+                fields += fields.IsNullOrEmpty() ? fieldSelector.GetFieldPath(): $" {fieldSelector.GetFieldPath()}";
+            }
+            var combinedPath = ConvertNestedFieldToString.ConvertNestedFieldForQuery($"{enumPath}.{fields}");
+            Field(combinedPath);
+            return this;
+        }
         [Obsolete("Obsoleted. Use InlineFragment instead")]
         /// <summary>
         /// Select fields in a subtype. The response of your query may need to convert data type. If then consider to use GetContent<TOriginal,TExpectedType> method.
@@ -271,6 +292,12 @@ public TypeQueryBuilder<T> Autocomplete(Expression<Func<T, object>> fieldSelecto
             }
             return this;
         }
+        private void SetFacetClause(string facetClause)
+        {
+            graphObject.Facets = graphObject.Facets.IsNullOrEmpty() ?
+            $"{facetClause}" :
+                $"{graphObject.Facets} {facetClause}";
+        }
         /// <summary>
         /// Get facet by field
         /// </summary>
@@ -303,9 +330,25 @@ public TypeQueryBuilder<T> Facet(Expression<Func<T, int>> fieldSelector)
         public TypeQueryBuilder<T> Facet(string propertyName)
         {
             string facet = ConvertNestedFieldToString.ConvertNestedFieldForFacet(propertyName);
-            graphObject.Facets = graphObject.Facets.IsNullOrEmpty() ?
-                $"{facet}" :
-                $"{graphObject.Facets} {facet}";
+            SetFacetClause(facet);
+            return this;
+        }
+        public TypeQueryBuilder<T> Facet<TField>(Expression<Func<T, IEnumerable<TField>>> enumSelector, Expression<Func<TField, object>> fieldSelector)
+        {
+            enumSelector.ValidateNotNullArgument("enumSelector");
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            var combinePath = $"{enumSelector.GetFieldPath()}.{fieldSelector.GetFieldPath()}";
+            Facet(combinePath);
+            return this;
+        }
+        public TypeQueryBuilder<T> Facet<TField>(Expression<Func<T, IEnumerable<TField>>> enumSelector, Expression<Func<TField, FacetFilter>> fieldSelector)
+        {
+            enumSelector.ValidateNotNullArgument("enumSelector");
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            var parse = new FacetExpressionParser();
+            var facetFilter = parse.GetFacetFilter(fieldSelector);
+
+            SetFacetClause($"{enumSelector.GetFieldPath()}{{{facetFilter.FilterClause}}}");
             return this;
         }
         public TypeQueryBuilder<T> Total(bool? isAll = null)
@@ -467,6 +510,17 @@ private string MergeFilters(string exsting, string additional)
             }
             return exsting;
         }
+        private void SetWhereClause(string clause)
+        {
+            if (graphObject.WhereClause.IsNullOrEmpty())
+            {
+                graphObject.WhereClause = clause;
+            }
+            else
+            {
+                graphObject.WhereClause += $",{clause}";
+            }
+        }
         public TypeQueryBuilder<T> Where(string fieldName, IFilterOperator filterOperator)
         {
             filterOperator.ValidateNotNullArgument("filterOperator");
@@ -488,14 +542,7 @@ public TypeQueryBuilder<T> Where(string fieldName, IFilterOperator filterOperato
                 }
             }
 
-            if (graphObject.WhereClause.IsNullOrEmpty())
-            {
-                graphObject.WhereClause = $"{combinedQuery}";
-            }
-            else
-            {
-                graphObject.WhereClause += $",{combinedQuery}";
-            }
+            SetWhereClause(combinedQuery);
 
             return this;
         }
@@ -518,6 +565,14 @@ public TypeQueryBuilder<T> Where(Expression<Func<T, string>> fieldSelector, Stri
 
             return this;
         }
+        public TypeQueryBuilder<T> Where(Expression<Func<T, IEnumerable<string>>> fieldSelector, StringFilterOperators filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            filterOperator.ValidateNotNullArgument("filterOperator");
+            Where(fieldSelector.GetFieldPath(), filterOperator);
+
+            return this;
+        }
         public TypeQueryBuilder<T> Where(Expression<Func<T, long?>> fieldSelector, NumericFilterOperators filterOperator)
         {
             fieldSelector.ValidateNotNullArgument("fieldSelector");
@@ -526,6 +581,62 @@ public TypeQueryBuilder<T> Where(Expression<Func<T, long?>> fieldSelector, Numer
 
             return this;
         }
+        public TypeQueryBuilder<T> Where(Expression<Func<T, IEnumerable<long>>> fieldSelector, NumericFilterOperators filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            filterOperator.ValidateNotNullArgument("filterOperator");
+            Where(fieldSelector.GetFieldPath(), filterOperator);
+
+            return this;
+        }
+        public TypeQueryBuilder<T> Where(Expression<Func<T, int?>> fieldSelector, NumericFilterOperators filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            filterOperator.ValidateNotNullArgument("filterOperator");
+            Where(fieldSelector.GetFieldPath(), filterOperator);
+
+            return this;
+        }
+        public TypeQueryBuilder<T> Where(Expression<Func<T, IEnumerable<int>>> fieldSelector, NumericFilterOperators filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            filterOperator.ValidateNotNullArgument("filterOperator");
+            Where(fieldSelector.GetFieldPath(), filterOperator);
+
+            return this;
+        }
+        public TypeQueryBuilder<T> Where(Expression<Func<T, float?>> fieldSelector, NumericFilterOperators filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            filterOperator.ValidateNotNullArgument("filterOperator");
+            Where(fieldSelector.GetFieldPath(), filterOperator);
+
+            return this;
+        }
+        public TypeQueryBuilder<T> Where(Expression<Func<T, IEnumerable<float>>> fieldSelector, NumericFilterOperators filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            filterOperator.ValidateNotNullArgument("filterOperator");
+            Where(fieldSelector.GetFieldPath(), filterOperator);
+
+            return this;
+        }
+        public TypeQueryBuilder<T> Where(Expression<Func<T, double?>> fieldSelector, NumericFilterOperators filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            filterOperator.ValidateNotNullArgument("filterOperator");
+            Where(fieldSelector.GetFieldPath(), filterOperator);
+
+            return this;
+        }
+        public TypeQueryBuilder<T> Where(Expression<Func<T, IEnumerable<double>>> fieldSelector, NumericFilterOperators filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            filterOperator.ValidateNotNullArgument("filterOperator");
+            Where(fieldSelector.GetFieldPath(), filterOperator);
+
+            return this;
+        }
         public TypeQueryBuilder<T> Where(Expression<Func<T, string>> fieldSelector, DateFilterOperators filterOperator)
         {
             fieldSelector.ValidateNotNullArgument("fieldSelector");
@@ -534,6 +645,14 @@ public TypeQueryBuilder<T> Where(Expression<Func<T, string>> fieldSelector, Date
 
             return this;
         }
+        public TypeQueryBuilder<T> Where(Expression<Func<T, IEnumerable<string>>> fieldSelector, DateFilterOperators filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            filterOperator.ValidateNotNullArgument("filterOperator");
+            Where(fieldSelector.GetFieldPath(), filterOperator);
+
+            return this;
+        }
         public TypeQueryBuilder<T> Where(Expression<Func<T, bool>> fieldSelector, BooleanFilterOperators filterOperator)
         {
             fieldSelector.ValidateNotNullArgument("fieldSelector");
@@ -542,6 +661,14 @@ public TypeQueryBuilder<T> Where(Expression<Func<T, bool>> fieldSelector, Boolea
 
             return this;
         }
+        public TypeQueryBuilder<T> Where(Expression<Func<T, IEnumerable<bool>>> fieldSelector, BooleanFilterOperators filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            filterOperator.ValidateNotNullArgument("filterOperator");
+            Where(fieldSelector.GetFieldPath(), filterOperator);
+
+            return this;
+        }
         public TypeQueryBuilder<T> Where(Expression<Func<T, DateTime?>> fieldSelector, DateFilterOperators filterOperator)
         {
             fieldSelector.ValidateNotNullArgument("fieldSelector");
@@ -550,28 +677,65 @@ public TypeQueryBuilder<T> Where(Expression<Func<T, DateTime?>> fieldSelector, D
 
             return this;
         }
+        public TypeQueryBuilder<T> Where(Expression<Func<T, IEnumerable<DateTime>>> fieldSelector, DateFilterOperators filterOperator)
+        {
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            filterOperator.ValidateNotNullArgument("filterOperator");
+            Where(fieldSelector.GetFieldPath(), filterOperator);
+
+            return this;
+        }
         public TypeQueryBuilder<T> Where(IFilter filter)
         {
             filter.ValidateNotNullArgument("filter");
-            if (graphObject.WhereClause.IsNullOrEmpty())
-            {
-                graphObject.WhereClause = $"{filter.FilterClause}";
-            }
-            else
+            SetWhereClause(filter.FilterClause);
+            return this;
+        }
+        //Support filter property of IEnumerable with filter extension
+        public TypeQueryBuilder<T> Where<TField>(Expression<Func<T, IEnumerable<TField>>> enumSelector, Expression<Func<TField, Filter>> fieldSelector)
+        {
+            enumSelector.ValidateNotNullArgument("enumSelector");
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+
+            var enumPath = enumSelector.GetFieldPath();
+            var paser = new FilterExpressionParser();
+            var filter = paser.GetFilter(fieldSelector);
+            if (filter.IsNotNull())
             {
-                graphObject.WhereClause += $",{filter.FilterClause}";
+                var fieldFilter = filter.FilterClause;
+                var combineFilter = $"{enumPath}:{{{fieldFilter}}}";
+                SetWhereClause(combineFilter);
             }
+            return this;
+        }
+        //Support filter property of IEnumerable with filter operator
+        public TypeQueryBuilder<T> Where<TField>(Expression<Func<T, IEnumerable<TField>>> enumSelector, 
+            Expression<Func<TField, object>> fieldSelector, IFilterOperator filterOperator)
+        {
+            enumSelector.ValidateNotNullArgument("enumSelector");
+            fieldSelector.ValidateNotNullArgument("fieldSelector");
+            filterOperator.ValidateNotNullArgument("filterOperator");
+
+            var enumPath = enumSelector.GetFieldPath();
+            var fullFieldPath = $"{enumPath}.{fieldSelector.GetFieldPath()}";
 
+            Where(fullFieldPath, filterOperator);
+            return this;
+        }
+        //Support raw string field path
+        public TypeQueryBuilder<T> Where<TField>(string fieldPath, IFilterOperator filterOperator)
+        {
+            fieldPath.ValidateNotNullArgument("fieldPath");
+            filterOperator.ValidateNotNullArgument("filterOperator");
+            Where(fieldPath, filterOperator);
             return this;
         }
-        private TypeQueryBuilder<T> Facet(string propertyName, IFacetOperator facetFilter)
+        public TypeQueryBuilder<T> Facet(string propertyName, IFacetOperator facetFilter)
         {
             propertyName.ValidateNotNullArgument("propertyName");
             facetFilter.ValidateNotNullArgument("facetFilter");
             string facets = ConvertNestedFieldToString.ConvertNestedFieldForFacet(propertyName, facetFilter);
-            graphObject.Facets = graphObject.Facets.IsNullOrEmpty() ?
-                $"{facets}" :
-                $"{graphObject.Facets} {facets}";
+            SetFacetClause(facets);
             return this;
         }
         public TypeQueryBuilder<T> Facet(Expression<Func<T, object>> fieldSelector, IFacetOperator facetFilter)
@@ -645,9 +809,7 @@ public TypeQueryBuilder<T> Facet(Expression<Func<T, DateTime?>> fieldSelector, D
         public TypeQueryBuilder<T> Facet(IFacetFilter facetFilter)
         {
             facetFilter.ValidateNotNullArgument("facetFilter");
-            graphObject.Facets = graphObject.Facets.IsNullOrEmpty() ?
-                $"{facetFilter.FilterClause}" :
-                $"{graphObject.Facets} {facetFilter.FilterClause}";
+            SetFacetClause(facetFilter.FilterClause);
             return this;
         }
         public TypeQueryBuilder<T> FilterForVisitor(params IFilterForVisitor[] filterForVisitors)
diff --git a/APIs/src/EpiServer.ContentGraph/Extensions/FacetExtension.cs b/APIs/src/EpiServer.ContentGraph/Extensions/FacetExtension.cs
index 72c1e742..6f1b80df 100644
--- a/APIs/src/EpiServer.ContentGraph/Extensions/FacetExtension.cs
+++ b/APIs/src/EpiServer.ContentGraph/Extensions/FacetExtension.cs
@@ -5,10 +5,31 @@ namespace EPiServer.ContentGraph.Extensions
 {
     public static class FacetExtension
     {
-        public static DelegateFacetFilterBuilder FacetLimit(this object field, int limit=5)
+        public static DelegateFacetFilterBuilder FacetLimit(this object field, int limit = 5)
         {
             return new DelegateFacetFilterBuilder(field => new TermFacetFilter(field, new StringFacetFilterOperators().Limit(limit)));
         }
+        public static DelegateFacetFilterBuilder FacetLimit(this string field, int limit=5)
+        {
+            return new DelegateFacetFilterBuilder(field => new TermFacetFilter(field, new StringFacetFilterOperators().Limit(limit)));
+        }
+        public static DelegateFacetFilterBuilder FacetLimit(this float field, int limit = 5)
+        {
+            return new DelegateFacetFilterBuilder(field => new TermFacetFilter(field, new StringFacetFilterOperators().Limit(limit)));
+        }
+        public static DelegateFacetFilterBuilder FacetLimit(this double field, int limit = 5)
+        {
+            return new DelegateFacetFilterBuilder(field => new TermFacetFilter(field, new StringFacetFilterOperators().Limit(limit)));
+        }
+        public static DelegateFacetFilterBuilder FacetLimit(this int field, int limit = 5)
+        {
+            return new DelegateFacetFilterBuilder(field => new TermFacetFilter(field, new StringFacetFilterOperators().Limit(limit)));
+        }
+        public static DelegateFacetFilterBuilder FacetLimit(this bool field, int limit = 5)
+        {
+            return new DelegateFacetFilterBuilder(field => new TermFacetFilter(field, new StringFacetFilterOperators().Limit(limit)));
+        }
+
         public static DelegateFacetFilterBuilder FacetFilters(this string field, params string[] values)
         {
             return new DelegateFacetFilterBuilder(field => new TermFacetFilter(field, new StringFacetFilterOperators().Filters(values)));
@@ -66,5 +87,37 @@ public static DelegateFacetFilterBuilder FacetInRange(this IEnumerable<float> fi
         {
             return new DelegateFacetFilterBuilder(field => new TermFacetFilter(field, new NumericFacetFilterOperators().Ranges((from, to))));
         }
+        public static DelegateFacetFilterBuilder FacetInRanges(this float field, params (float? from, float? to)[] ranges)
+        {
+            return new DelegateFacetFilterBuilder(field => new TermFacetFilter(field, new NumericFacetFilterOperators().Ranges(ranges)));
+        }
+        public static DelegateFacetFilterBuilder FacetInRanges(this IEnumerable<float> field, params (float? from, float? to)[] ranges)
+        {
+            return new DelegateFacetFilterBuilder(field => new TermFacetFilter(field, new NumericFacetFilterOperators().Ranges(ranges)));
+        }
+        public static DelegateFacetFilterBuilder FacetInRanges(this double field, params (double? from, double? to)[] ranges)
+        {
+            return new DelegateFacetFilterBuilder(field => new TermFacetFilter(field, new NumericFacetFilterOperators().Ranges(ranges)));
+        }
+        public static DelegateFacetFilterBuilder FacetInRanges(this IEnumerable<double> field, params (double? from, double? to)[] ranges)
+        {
+            return new DelegateFacetFilterBuilder(field => new TermFacetFilter(field, new NumericFacetFilterOperators().Ranges(ranges)));
+        }
+        public static DelegateFacetFilterBuilder FacetInRanges(this int field, params (int? from, int? to)[] ranges)
+        {
+            return new DelegateFacetFilterBuilder(field => new TermFacetFilter(field, new NumericFacetFilterOperators().Ranges(ranges)));
+        }
+        public static DelegateFacetFilterBuilder FacetInRanges(this IEnumerable<int> field, params (int? from, int? to)[] ranges)
+        {
+            return new DelegateFacetFilterBuilder(field => new TermFacetFilter(field, new NumericFacetFilterOperators().Ranges(ranges)));
+        }
+        public static DelegateFacetFilterBuilder FacetInRanges(this long field, params (long? from, long? to)[] ranges)
+        {
+            return new DelegateFacetFilterBuilder(field => new TermFacetFilter(field, new NumericFacetFilterOperators().Ranges(ranges)));
+        }
+        public static DelegateFacetFilterBuilder FacetInRanges(this IEnumerable<long> field, params (long? from, long? to)[] ranges)
+        {
+            return new DelegateFacetFilterBuilder(field => new TermFacetFilter(field, new NumericFacetFilterOperators().Ranges(ranges)));
+        }
     }
 }
diff --git a/APIs/src/EpiServer.ContentGraph/Extensions/FilterExtension.cs b/APIs/src/EpiServer.ContentGraph/Extensions/FilterExtension.cs
index 9cc9d9d6..3cb6641d 100644
--- a/APIs/src/EpiServer.ContentGraph/Extensions/FilterExtension.cs
+++ b/APIs/src/EpiServer.ContentGraph/Extensions/FilterExtension.cs
@@ -188,16 +188,6 @@ public static DelegateFilterBuilder InRange(this int field, int from, int to)
         {
             return new DelegateFilterBuilder(field => new TermFilter(field, new NumericFilterOperators().InRange(from,to)));
         }
-        /// <summary>
-        /// Multiple ranges for InRange filter. 
-        /// </summary>
-        /// <param name="field"></param>
-        /// <param name="ranges">Array of tuples (from,to)</param>
-        /// <returns></returns>
-        public static DelegateFilterBuilder InRanges(this int field, params (int? from, int? to)[] ranges)
-        {
-            return new DelegateFilterBuilder(field => new TermFilter(field, new NumericFilterOperators().InRanges(ranges)));
-        }
         #endregion
 
         #region Long type
@@ -248,16 +238,6 @@ public static DelegateFilterBuilder InRange(this long field, int from, int to)
         {
             return new DelegateFilterBuilder(field => new TermFilter(field, new NumericFilterOperators().InRange(from, to)));
         }
-        /// <summary>
-        /// Multiple ranges for InRange filter. 
-        /// </summary>
-        /// <param name="field"></param>
-        /// <param name="ranges">Array of tuples (from,to)</param>
-        /// <returns></returns>
-        public static DelegateFilterBuilder InRanges(this long field, params (int? from, int? to)[] ranges)
-        {
-            return new DelegateFilterBuilder(field => new TermFilter(field, new NumericFilterOperators().InRanges(ranges)));
-        }
         #endregion
 
         #region Float type
@@ -308,16 +288,6 @@ public static DelegateFilterBuilder InRange(this float field, int from, int to)
         {
             return new DelegateFilterBuilder(field => new TermFilter(field, new NumericFilterOperators().InRange(from, to)));
         }
-        /// <summary>
-        /// Multiple ranges for InRange filter. 
-        /// </summary>
-        /// <param name="field"></param>
-        /// <param name="ranges">Array of tuples (from,to)</param>
-        /// <returns></returns>
-        public static DelegateFilterBuilder InRanges(this float field, params (float? from, float? to)[] ranges)
-        {
-            return new DelegateFilterBuilder(field => new TermFilter(field, new NumericFilterOperators().InRanges(ranges)));
-        }
         #endregion
 
         #region Double type
@@ -368,16 +338,6 @@ public static DelegateFilterBuilder InRange(this double field, int from, int to)
         {
             return new DelegateFilterBuilder(field => new TermFilter(field, new NumericFilterOperators().InRange(from, to)));
         }
-        /// <summary>
-        /// Multiple ranges for InRange filter. 
-        /// </summary>
-        /// <param name="field"></param>
-        /// <param name="ranges">Array of tuples (from,to)</param>
-        /// <returns></returns>
-        public static DelegateFilterBuilder InRanges(this double field, params (float? from, float? to)[] ranges)
-        {
-            return new DelegateFilterBuilder(field => new TermFilter(field, new NumericFilterOperators().InRanges(ranges)));
-        }
         #endregion
 
         #endregion
diff --git a/APIs/src/EpiServer.ContentGraph/Extensions/FilterExtensionIEnumerable.cs b/APIs/src/EpiServer.ContentGraph/Extensions/FilterExtensionIEnumerable.cs
index 4416c8be..0b3a55a7 100644
--- a/APIs/src/EpiServer.ContentGraph/Extensions/FilterExtensionIEnumerable.cs
+++ b/APIs/src/EpiServer.ContentGraph/Extensions/FilterExtensionIEnumerable.cs
@@ -142,16 +142,6 @@ public static DelegateFilterBuilder InRange(this IEnumerable<int> field, int fro
         {
             return new DelegateFilterBuilder(field => new TermFilter(field, new NumericFilterOperators().InRange(from, to)));
         }
-        /// <summary>
-        /// Multiple ranges for InRange filter. 
-        /// </summary>
-        /// <param name="field"></param>
-        /// <param name="ranges">Array of tuples (from,to)</param>
-        /// <returns></returns>
-        public static DelegateFilterBuilder InRanges(this IEnumerable<int> field, params (int? from, int? to)[] ranges)
-        {
-            return new DelegateFilterBuilder(field => new TermFilter(field, new NumericFilterOperators().InRanges(ranges)));
-        }
         #endregion
 
         #region Long type
@@ -202,16 +192,6 @@ public static DelegateFilterBuilder InRange(this IEnumerable<long> field, int fr
         {
             return new DelegateFilterBuilder(field => new TermFilter(field, new NumericFilterOperators().InRange(from, to)));
         }
-        /// <summary>
-        /// Multiple ranges for InRange filter. 
-        /// </summary>
-        /// <param name="field"></param>
-        /// <param name="ranges">Array of tuples (from,to)</param>
-        /// <returns></returns>
-        public static DelegateFilterBuilder InRanges(this IEnumerable<long> field, params (int? from, int? to)[] ranges)
-        {
-            return new DelegateFilterBuilder(field => new TermFilter(field, new NumericFilterOperators().InRanges(ranges)));
-        }
         #endregion
 
         #region Float type
@@ -262,16 +242,6 @@ public static DelegateFilterBuilder InRange(this IEnumerable<float> field, int f
         {
             return new DelegateFilterBuilder(field => new TermFilter(field, new NumericFilterOperators().InRange(from, to)));
         }
-        /// <summary>
-        /// Multiple ranges for InRange filter. 
-        /// </summary>
-        /// <param name="field"></param>
-        /// <param name="ranges">Array of tuples (from,to)</param>
-        /// <returns></returns>
-        public static DelegateFilterBuilder InRanges(this IEnumerable<float> field, params (float? from, float? to)[] ranges)
-        {
-            return new DelegateFilterBuilder(field => new TermFilter(field, new NumericFilterOperators().InRanges(ranges)));
-        }
         #endregion
 
         #region Double type
@@ -322,16 +292,6 @@ public static DelegateFilterBuilder InRange(this IEnumerable<double> field, int
         {
             return new DelegateFilterBuilder(field => new TermFilter(field, new NumericFilterOperators().InRange(from, to)));
         }
-        /// <summary>
-        /// Multiple ranges for InRange filter. 
-        /// </summary>
-        /// <param name="field"></param>
-        /// <param name="ranges">Array of tuples (from,to)</param>
-        /// <returns></returns>
-        public static DelegateFilterBuilder InRanges(this IEnumerable<double> field, params (float? from, float? to)[] ranges)
-        {
-            return new DelegateFilterBuilder(field => new TermFilter(field, new NumericFilterOperators().InRanges(ranges)));
-        }
         #endregion
         
         #endregion
diff --git a/APIs/src/Templates/Alloy/Controllers/SearchPageController.cs b/APIs/src/Templates/Alloy/Controllers/SearchPageController.cs
index 65e3b087..27cb1c2e 100644
--- a/APIs/src/Templates/Alloy/Controllers/SearchPageController.cs
+++ b/APIs/src/Templates/Alloy/Controllers/SearchPageController.cs
@@ -25,8 +25,9 @@ public ViewResult Index(SearchPage currentPage, string q, string t, string p = "
                     .Skip((int.Parse(p) -1) * 10)
                     .Limit(10)
                     .Fields(x=>x.Name, x=> x.Url)
+                    .NestedFields(x=> x.ExistingLanguages, x=> x.Name)
                     .Total()
-                        .AsType<ProxyModels.ArticlePage>(x=>x.MetaDescription, x=> x.MetaTitle)
+                    .InlineFragment<ProxyModels.ArticlePage>(x=>x.MetaDescription, x=> x.MetaTitle)
                     .Search(q)
                     .FilterForVisitor()
                     .Facet(x=>x.ContentType.FacetFilters(t))
diff --git a/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/EpiServer.ContentGraph.UnitTests.csproj b/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/EpiServer.ContentGraph.UnitTests.csproj
index 88601790..2e5980b5 100644
--- a/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/EpiServer.ContentGraph.UnitTests.csproj
+++ b/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/EpiServer.ContentGraph.UnitTests.csproj
@@ -7,12 +7,15 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="Moq" Version="4.17.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
     <PackageReference Include="xunit.assert" Version="2.5.1" />
     <PackageReference Include="xunit.core" Version="2.5.1" />
+    <PackageReference Include="Xunit.DependencyInjection" Version="9.5.0" />
     <PackageReference Include="xunit.runner.console" Version="2.5.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/ExtensionTests/FacetExtensionTests.cs b/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/ExtensionTests/FacetExtensionTests.cs
new file mode 100644
index 00000000..c497b14b
--- /dev/null
+++ b/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/ExtensionTests/FacetExtensionTests.cs
@@ -0,0 +1,82 @@
+using EPiServer.ContentGraph.Api.Querying;
+using EpiServer.ContentGraph.UnitTests.QueryTypeObjects;
+using Xunit;
+using EPiServer.ContentGraph.Extensions;
+
+namespace EpiServer.ContentGraph.UnitTests.ExtensionTests
+{
+    [CollectionDefinition("Facet extension tests")]
+    public class FacetExtensionTests
+    {
+        TypeQueryBuilder<RequestTypeObject> typeQueryBuilder;
+        public FacetExtensionTests()
+        {
+            typeQueryBuilder = new TypeQueryBuilder<RequestTypeObject>();
+        }
+
+        [Fact]
+        public void generate_facet_filter_with_extension()
+        {
+            const string expectedFields = "items{Property1}";
+            const string expectedFacet = "facets{Property1(filters: [\"test\"]){name count}}";
+            const string expectedFullQuery = $"RequestTypeObject{{{expectedFields} {expectedFacet}}}";
+
+            typeQueryBuilder.Field(x => x.Property1);
+            typeQueryBuilder.Facet(x => x.Property1.FacetFilters("test"));
+
+            var query = typeQueryBuilder.ToQuery().GetQuery();
+
+            Assert.NotNull(query);
+            Assert.Contains(expectedFacet, query.Query);
+            Assert.Equal(query.Query, expectedFullQuery);
+        }
+        [Fact]
+        public void generate_facet_limit_with_extension()
+        {
+            const string expectedFields = "items{Property1}";
+            const string expectedFacet = "facets{Property1(limit: 10){name count}}";
+            const string expectedFullQuery = $"RequestTypeObject{{{expectedFields} {expectedFacet}}}";
+
+            typeQueryBuilder.Field(x => x.Property1);
+            typeQueryBuilder.Facet(x => x.Property1.FacetLimit(10));
+
+            var query = typeQueryBuilder.ToQuery().GetQuery();
+
+            Assert.NotNull(query);
+            Assert.Contains(expectedFacet, query.Query);
+            Assert.Equal(query.Query, expectedFullQuery);
+        }
+        [Fact]
+        public void generate_facet_with_IEnumerable()
+        {
+            const string expectedFields = "items{Property1}";
+            const string expectedFacet = "facets{NestedObjects{NestedProperty{name count}}}";
+            const string expectedFullQuery = $"RequestTypeObject{{{expectedFields} {expectedFacet}}}";
+
+            typeQueryBuilder.Field(x => x.Property1);
+            typeQueryBuilder.Facet(x => x.NestedObjects, f=> f.NestedProperty);
+
+            var query = typeQueryBuilder.ToQuery().GetQuery();
+
+            Assert.NotNull(query);
+            Assert.Contains(expectedFacet, query.Query);
+            Assert.Equal(query.Query, expectedFullQuery);
+        }
+        [Fact]
+        public void generate_facet_limit_with_IEnumerable()
+        {
+            const string expectedFields = "items{Property1}";
+            const string expectedFacet = "facets{NestedObjects{NestedProperty(limit: 10){name count}}}";
+            const string expectedFullQuery = $"RequestTypeObject{{{expectedFields} {expectedFacet}}}";
+
+            typeQueryBuilder.Field(x => x.Property1);
+            typeQueryBuilder.Facet(x => x.NestedObjects, f => f.NestedProperty.FacetLimit(10));
+
+            var query = typeQueryBuilder.ToQuery().GetQuery();
+
+            Assert.NotNull(query);
+            Assert.Contains(expectedFacet, query.Query);
+            Assert.Equal(query.Query, expectedFullQuery);
+        }
+    }
+}
diff --git a/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/ExtensionTests/QueryExtensionTests.cs b/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/ExtensionTests/QueryExtensionTests.cs
index b1d4eaf4..47aeb92f 100644
--- a/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/ExtensionTests/QueryExtensionTests.cs
+++ b/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/ExtensionTests/QueryExtensionTests.cs
@@ -66,6 +66,23 @@ public void GetScore_should_build_query_with_score_field()
             typeQueryBuilder.GetScore();
             var query = typeQueryBuilder.ToQuery().GetQuery();
 
+            Assert.NotNull(query);
+            Assert.Contains(expectedFields, query.Query);
+            Assert.Equal(query.Query, expectedFullQuery);
+        }
+        [Fact]
+        public void generate_where_with_IEnumerable()
+        {
+            const string expectedFields = "{items{Property1 _score}}";
+            const string expectedFilter = "where:{NestedObjects:{NestedProperty:{eq: 100}}}";
+            const string expectedFullQuery = $"RequestTypeObject({expectedFilter}){expectedFields}";
+
+            typeQueryBuilder.Field(x => x.Property1);
+            typeQueryBuilder.GetScore();
+            typeQueryBuilder.Where(x => x.NestedObjects, f => f.NestedProperty.Eq(100));
+
+            var query = typeQueryBuilder.ToQuery().GetQuery();
+
             Assert.NotNull(query);
             Assert.Contains(expectedFields, query.Query);
             Assert.Equal(query.Query, expectedFullQuery);
diff --git a/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/GenerateFilterTests.cs b/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/GenerateFilterTests.cs
index 56d850dd..f9e14179 100644
--- a/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/GenerateFilterTests.cs
+++ b/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/GenerateFilterTests.cs
@@ -103,5 +103,37 @@ public void SingleFieldWithNotFiltersTest()
             Assert.Contains(expectedFilters, query);
             Assert.Equal($"{type}{expectedFilters}{items}", query);
         }
+        [Fact]
+        public void generate_where_with_raw_string()
+        {
+            const string expectedFields = "{items{Property1}}";
+            const string expectedFilter = "where:{Nesteds:{NestedProperty:{eq: 100}}}";
+            const string expectedFullQuery = $"RequestTypeObject({expectedFilter}){expectedFields}";
+
+            typeQueryBuilder.Field(x => x.Property1);
+            typeQueryBuilder.Where("Nesteds.NestedProperty", new NumericFilterOperators().Eq(100));
+
+            var query = typeQueryBuilder.ToQuery().GetQuery();
+
+            Assert.NotNull(query);
+            Assert.Contains(expectedFields, query.Query);
+            Assert.Equal(query.Query, expectedFullQuery);
+        }
+        [Fact]
+        public void generate_where_with_IFilterOperator()
+        {
+            const string expectedFields = "{items{Property1}}";
+            const string expectedFilter = "where:{NestedObjects:{NestedProperty:{eq: 100}}}";
+            const string expectedFullQuery = $"RequestTypeObject({expectedFilter}){expectedFields}";
+
+            typeQueryBuilder.Field(x => x.Property1);
+            typeQueryBuilder.Where(x => x.NestedObjects, f => f.NestedProperty, new NumericFilterOperators().Eq(100));
+
+            var query = typeQueryBuilder.ToQuery().GetQuery();
+
+            Assert.NotNull(query);
+            Assert.Contains(expectedFields, query.Query);
+            Assert.Equal(query.Query, expectedFullQuery);
+        }
     }
 }
diff --git a/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/GenerateQueryTests.cs b/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/GenerateQueryTests.cs
index 2f50767d..db841d7a 100644
--- a/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/GenerateQueryTests.cs
+++ b/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/GenerateQueryTests.cs
@@ -26,6 +26,7 @@ public void SelectNoneOfFieldsShouldThrowException()
         }
 
         [Fact]
+        [Category("Select Fields")]
         public void SelectFields()
         {
             string expectedFields = @"{items{Property1 Property2}}";
@@ -35,10 +36,24 @@ public void SelectFields()
             Assert.NotNull(query.GetQuery());
             //check selected fields
             Assert.Contains(expectedFields, query.GetQuery().Query);
-            query = query.BuildQueries();
         }
 
         [Fact]
+        [Category("Select Fields")]
+        public void SelectFieldsOfEnumerable()
+        {
+            string expectedFields = @"{items{Property1 Property2 NestedObjects{NestedProperty}}}";
+            typeQueryBuilder.Fields(x => x.Property1, x => x.Property2);
+            typeQueryBuilder.NestedFields(x => x.NestedObjects, f => f.NestedProperty);
+            GraphQueryBuilder query = typeQueryBuilder.ToQuery();
+
+            Assert.NotNull(query.GetQuery());
+            //check selected fields
+            Assert.Contains(expectedFields, query.GetQuery().Query);
+        }
+
+        [Fact]
+        [Category("Select Fields")]
         public void SelectFieldWithAlias()
         {
             string expectedFields = @"{items{property1:Property1 property2:Property2}}";
@@ -52,6 +67,7 @@ public void SelectFieldWithAlias()
         }
 
         [Fact]
+        [Category("Select Fields")]
         public void SelectNestedFields()
         {
             string expectedFields = @"{items{Property1 Property2 Property3{NestedProperty}}}";
diff --git a/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/QueryTypeObjects/NestedObject.cs b/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/QueryTypeObjects/NestedObject.cs
index d1d2a949..f47b7681 100644
--- a/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/QueryTypeObjects/NestedObject.cs
+++ b/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/QueryTypeObjects/NestedObject.cs
@@ -3,5 +3,6 @@
     internal class NestedObject
     {
         public int NestedProperty { get; set; }
+        public string NestedStringProperty { get; set; }
     }
 }
diff --git a/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/QueryTypeObjects/RequestTypeObject.cs b/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/QueryTypeObjects/RequestTypeObject.cs
index a96dca3e..585c3965 100644
--- a/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/QueryTypeObjects/RequestTypeObject.cs
+++ b/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/QueryTypeObjects/RequestTypeObject.cs
@@ -11,5 +11,6 @@ internal class RequestTypeObject
         public string Property1 { get; set; }
         public int Property2 { get; set; }
         public NestedObject Property3 { get; set; }
+        public IEnumerable<NestedObject> NestedObjects { get; set; }
     }
 }
diff --git a/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/Startup.cs b/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/Startup.cs
new file mode 100644
index 00000000..f010e67a
--- /dev/null
+++ b/APIs/src/Testing/EpiServer.ContentGraph.UnitTests/Startup.cs
@@ -0,0 +1,17 @@
+using EPiServer.ContentGraph.Connection;
+using EPiServer.ServiceLocation;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace EpiServer.ContentGraph.UnitTests
+{
+    public class Startup
+    {
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddMemoryCache();
+            services.AddSingleton<ICache, RuntimeCacheAdapter>();
+            var provider = services.BuildServiceProvider();
+            CacheAccessor.Cache = provider.GetService<ICache>();
+        }
+    }
+}
diff --git a/msbuild/version.props b/msbuild/version.props
index 3b9cac61..0c0bd6d5 100644
--- a/msbuild/version.props
+++ b/msbuild/version.props
@@ -1,7 +1,7 @@
 <!-- This file may be overwritten by automation. Only values allowed here are VersionPrefix and VersionSuffix.  -->
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.2.0</VersionPrefix>
+    <VersionPrefix>1.3.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
\ No newline at end of file