diff --git a/src/YesSql.Abstractions/IQuery.cs b/src/YesSql.Abstractions/IQuery.cs
index deda013b..9611d699 100644
--- a/src/YesSql.Abstractions/IQuery.cs
+++ b/src/YesSql.Abstractions/IQuery.cs
@@ -12,14 +12,17 @@ public interface IQuery
         /// Adds a filter on the document type
         /// </summary>
         /// <param name="filterType">If <c>false</c> the document type won't be filtered.</param>
+        /// <param name="collection">The name of the collection to load the object.</param>
         /// <typeparam name="T">The type of document to return</typeparam>
-        IQuery<T> For<T>(bool filterType = true) where T : class;
+        IQuery<T> For<T>(bool filterType = true, string collection = null) where T : class;
 
         /// <summary>
         /// Defines what type of index should be returned
         /// </summary>
+        /// <param name="collection">The name of the collection to load the object.</param>
         /// <typeparam name="T">The type of index to return</typeparam>
-        IQueryIndex<T> ForIndex<T>() where T : class, IIndex;
+
+        IQueryIndex<T> ForIndex<T>(string collection = null) where T : class, IIndex;
 
         /// <summary>
         /// Returns documents from any type
diff --git a/src/YesSql.Core/Services/DefaultQuery.cs b/src/YesSql.Core/Services/DefaultQuery.cs
index 9224001b..32e2b28a 100644
--- a/src/YesSql.Core/Services/DefaultQuery.cs
+++ b/src/YesSql.Core/Services/DefaultQuery.cs
@@ -30,7 +30,7 @@ public QueryState(ISqlBuilder sqlBuilder, IStore store, string collection)
 
         public string _bindingName = "a1";
         public Dictionary<string, List<Type>> _bindings = new Dictionary<string, List<Type>>();
-        public readonly string _documentTable;
+        public string _documentTable;
         public string _lastParameterName;
         public ISqlBuilder _sqlBuilder;
         public List<Action<object, ISqlBuilder>> _parameterBindings;
@@ -57,6 +57,11 @@ public void FlushFilters()
                 _predicate = null;
             }
         }
+        public void SetCurrentCollection(string collection)
+        {
+            _collection = collection;
+            _documentTable = _store.Configuration.TableNameConvention.GetDocumentTable(collection);
+        }
 
         public string GetTableAlias(string tableName)
         {
@@ -1039,8 +1044,13 @@ public async Task<int> CountAsync()
             }
         }
 
-        IQuery<T> IQuery.For<T>(bool filterType)
+        IQuery<T> IQuery.For<T>(bool filterType, string collection)
         {
+            if (collection != null)
+            {
+                _collection = collection;
+                _queryState.SetCurrentCollection(collection);
+            }
             _queryState.GetBindings().Clear();
             _queryState.AddBinding(typeof(Document));
 
@@ -1056,8 +1066,13 @@ IQuery<T> IQuery.For<T>(bool filterType)
             return new Query<T>(this);
         }
 
-        IQueryIndex<TIndex> IQuery.ForIndex<TIndex>()
+        IQueryIndex<TIndex> IQuery.ForIndex<TIndex>(string collection)
         {
+            if (collection != null)
+            {
+                _collection = collection;
+                _queryState.SetCurrentCollection(collection);
+            }
             _queryState.GetBindings().Clear();
             _queryState.AddBinding(typeof(TIndex));
             _queryState._sqlBuilder.Select();
diff --git a/src/YesSql.Core/Session.cs b/src/YesSql.Core/Session.cs
index ba3f3b9f..cf90d2b1 100644
--- a/src/YesSql.Core/Session.cs
+++ b/src/YesSql.Core/Session.cs
@@ -781,7 +781,7 @@ private void BatchCommands()
             // holds the queries, parameters and actions returned by an IIndexCommand, until we know we can
             // add it to a batch if it fits the limits (page size and parameters boundaries)
             var localDbCommand = _connection.CreateCommand();
-            var localQueries = new List<string>();
+            var localQueries = new List<string>(); 
             var localActions = new List<Action<DbDataReader>>();
 
             var batch = new BatchCommand(_connection.CreateCommand());
diff --git a/test/YesSql.Tests/CoreTests.cs b/test/YesSql.Tests/CoreTests.cs
index 688865d9..99b57c60 100644
--- a/test/YesSql.Tests/CoreTests.cs
+++ b/test/YesSql.Tests/CoreTests.cs
@@ -4155,6 +4155,8 @@ public async Task ShouldQueryInnerSelectWithCollection()
                 Assert.Equal(0, await session.Query<Person, PersonByNameCol>(collection: "Col1").Where(x => x.Name.IsNotInAny<PersonByBothNamesCol>(y => y.Firstname)).CountAsync());
 
                 Assert.Equal(2, await session.Query("Col1").For<Person>().With<PersonByNameCol>().Where(x => x.Name.IsInAny<PersonByBothNamesCol>(y => y.Firstname)).CountAsync());
+                Assert.Equal(2, await session.Query().For<Person>(collection:"Col1").With<PersonByNameCol>().Where(x => x.Name.IsInAny<PersonByBothNamesCol>(y => y.Firstname)).CountAsync());
+                Assert.Equal(2, await session.Query("Col2").For<Person>(collection: "Col1").With<PersonByNameCol>().Where(x => x.Name.IsInAny<PersonByBothNamesCol>(y => y.Firstname)).CountAsync());
 
             }
         }