diff --git a/docs/en/Data-Filtering.md b/docs/en/Data-Filtering.md
index 6df738cf18..dc237f6151 100644
--- a/docs/en/Data-Filtering.md
+++ b/docs/en/Data-Filtering.md
@@ -239,15 +239,25 @@ protected override Expression<Func<TEntity, bool>> CreateFilterExpression<TEntit
 
 ### MongoDB
 
-ABP implements data filters directly in the [repository](Repositories.md) level for the [MongoDB Integration](MongoDB.md). So, it works only if you use the repositories properly. Otherwise, you should manually filter the data.
+ABP abstracts the `IMongoDbRepositoryFilterer` interface to implement data filtering for the [MongoDB Integration](MongoDB.md), it works only if you use the repositories properly. Otherwise, you should manually filter the data.
 
-Currently, the best way to implement a data filter for the MongoDB integration is to override the `AddGlobalFilters` in the repository derived from the `MongoDbRepository` class. Example:
+Currently, the best way to implement a data filter for the MongoDB integration is to create a derived class of `MongoDbRepositoryFilterer` and override `AddGlobalFilters`. Example:
 
 ````csharp
-public class BookRepository : MongoDbRepository<BookStoreMongoDbContext, Book, Guid>
+[ExposeServices(typeof(IMongoDbRepositoryFilterer<Book, Guid>))]
+public class BookMongoDbRepositoryFilterer : MongoDbRepositoryFilterer<Book, Guid> , ITransientDependency
 {
-    protected override void AddGlobalFilters(List<FilterDefinition<Book>> filters)
+    public BookMongoDbRepositoryFilterer(
+        IDataFilter dataFilter,
+        ICurrentTenant currentTenant) :
+        base(dataFilter, currentTenant)
     {
+    }
+
+    public override void AddGlobalFilters(List<FilterDefinition<Book>> filters)
+    {
+        base.AddGlobalFilters(filters);
+
         if (DataFilter.IsEnabled<IIsActive>())
         {
             filters.Add(Builders<Book>.Filter.Eq(e => ((IIsActive)e).IsActive, true));
@@ -256,7 +266,7 @@ public class BookRepository : MongoDbRepository<BookStoreMongoDbContext, Book, G
 }
 ````
 
-This example implements it only for the `Book` entity. If you want to implement for all entities (those implement the `IIsActive` interface), create your own custom MongoDB repository base class and override the `AddGlobalFilters` as shown below:
+This example implements it only for the `Book` entity. If you want to implement for all entities (those implement the `IIsActive` interface), create your own custom MongoDB repository filterer base class and override the `AddGlobalFilters` as shown below:
 
 ````csharp
 public abstract class MyMongoRepository<TMongoDbContext, TEntity, TKey> : MongoDbRepository<TMongoDbContext, TEntity, TKey>
@@ -271,6 +281,8 @@ public abstract class MyMongoRepository<TMongoDbContext, TEntity, TKey> : MongoD
 
     protected override void AddGlobalFilters(List<FilterDefinition<TEntity>> filters)
     {
+        base.AddGlobalFilters(filters);
+
         if (typeof(IIsActive).IsAssignableFrom(typeof(TEntity)) 
             && DataFilter.IsEnabled<IIsActive>())
         {
@@ -278,6 +290,15 @@ public abstract class MyMongoRepository<TMongoDbContext, TEntity, TKey> : MongoD
         }
     }
 }
-````
 
-> See "Set Default Repository Classes" section of the [MongoDb Integration document](MongoDB.md) to learn how to replace default repository base with your custom class.
\ No newline at end of file
+
+public class MyMongoDbModule : AbpModule
+{
+    public override void ConfigureServices(ServiceConfigurationContext context)
+    {
+        //.......
+        context.Services
+            .Replace(ServiceDescriptor.Transient(typeof(IMongoDbRepositoryFilterer<,>),typeof(MyMongoDbRepositoryFilterer<,>)));
+    }
+}
+````
\ No newline at end of file
diff --git a/docs/en/Data-Transfer-Objects.md b/docs/en/Data-Transfer-Objects.md
index bc81205b66..4d45570c1d 100644
--- a/docs/en/Data-Transfer-Objects.md
+++ b/docs/en/Data-Transfer-Objects.md
@@ -210,15 +210,15 @@ namespace AbpDemo
         {
             //Create the query
             var query = _productRepository
-                .OrderBy(input.Sorting)
-                .Skip(input.SkipCount)
-                .Take(input.MaxResultCount);
+                .OrderBy(input.Sorting);
 
             //Get total count from the repository
             var totalCount = await query.CountAsync();
             
             //Get entities from the repository
-            List<Product> products = await query.ToListAsync();
+            List<Product> products = await query                
+                .Skip(input.SkipCount)
+                .Take(input.MaxResultCount).ToListAsync();
 
             //Map entities to DTOs
             List<ProductDto> productDtos =
diff --git a/docs/en/Text-Templating-Scriban.md b/docs/en/Text-Templating-Scriban.md
index 51b6c50f88..324fed7b14 100644
--- a/docs/en/Text-Templating-Scriban.md
+++ b/docs/en/Text-Templating-Scriban.md
@@ -1,4 +1,4 @@
-# Razor Integration
+# Scriban Integration
 
 ## Installation
 
diff --git a/docs/zh-Hans/Data-Filtering.md b/docs/zh-Hans/Data-Filtering.md
index 45adcb6b05..74192cf426 100644
--- a/docs/zh-Hans/Data-Filtering.md
+++ b/docs/zh-Hans/Data-Filtering.md
@@ -188,15 +188,25 @@ protected override Expression<Func<TEntity, bool>> CreateFilterExpression<TEntit
 
 ### MongoDB
 
-ABP直接在[仓储](Repositories.md)级别实现数据过滤用于[MongoDB 集成](MongoDB.md). 所以只有正确的使用仓储,它才会工作. 否则你需要手动过滤数据.
+ABP抽象了 `IMongoDbRepositoryFilterer` 接口为[MongoDB 集成](MongoDB.md)实现数据过滤, 只有正确的使用仓储,它才会工作. 否则你需要手动过滤数据.
 
-目前为MongoDB集成实现数据过滤的最佳方法是重写派生自 `MongoDbRepository` 仓储的 `AddGlobalFilters` 方法:
+目前为MongoDB集成实现数据过滤的最佳方法是重写派生自 `MongoDbRepositoryFilterer` 基类的 `AddGlobalFilters` 方法:
 
 ````csharp
-public class BookRepository : MongoDbRepository<BookStoreMongoDbContext, Book, Guid>
+[ExposeServices(typeof(IMongoDbRepositoryFilterer<Book, Guid>))]
+public class BookMongoDbRepositoryFilterer : MongoDbRepositoryFilterer<Book, Guid> , ITransientDependency
 {
-    protected override void AddGlobalFilters(List<FilterDefinition<Book>> filters)
+    public BookMongoDbRepositoryFilterer(
+        IDataFilter dataFilter,
+        ICurrentTenant currentTenant) :
+        base(dataFilter, currentTenant)
     {
+    }
+
+    public override void AddGlobalFilters(List<FilterDefinition<Book>> filters)
+    {
+        base.AddGlobalFilters(filters);
+
         if (DataFilter.IsEnabled<IIsActive>())
         {
             filters.Add(Builders<Book>.Filter.Eq(e => ((IIsActive)e).IsActive, true));
@@ -205,7 +215,7 @@ public class BookRepository : MongoDbRepository<BookStoreMongoDbContext, Book, G
 }
 ````
 
-示例中仅为 `Book` 实体实现了过滤. 如果你想要为所有的实体实现过滤 (实现了 `IIsActive` 接口的实体),可以创建自己的MongoDB仓储基类并重 写 `AddGlobalFilters` 方法. 如下所示:
+示例中仅为 `Book` 实体实现了过滤. 如果你想要为所有的实体实现过滤 (实现了 `IIsActive` 接口的实体),可以创建自己的 `MongoDbRepositoryFilterer` 基类并重 写 `AddGlobalFilters` 方法. 如下所示:
 
 ````csharp
 public abstract class MyMongoRepository<TMongoDbContext, TEntity, TKey> : MongoDbRepository<TMongoDbContext, TEntity, TKey>
@@ -220,6 +230,8 @@ public abstract class MyMongoRepository<TMongoDbContext, TEntity, TKey> : MongoD
 
     protected override void AddGlobalFilters(List<FilterDefinition<TEntity>> filters)
     {
+        base.AddGlobalFilters(filters);
+
         if (typeof(IIsActive).IsAssignableFrom(typeof(TEntity)) 
             && DataFilter.IsEnabled<IIsActive>())
         {
@@ -227,6 +239,17 @@ public abstract class MyMongoRepository<TMongoDbContext, TEntity, TKey> : MongoD
         }
     }
 }
+
+
+public class MyMongoDbModule : AbpModule
+{
+    public override void ConfigureServices(ServiceConfigurationContext context)
+    {
+        //.......
+        context.Services
+            .Replace(ServiceDescriptor.Transient(typeof(IMongoDbRepositoryFilterer<,>),typeof(MyMongoDbRepositoryFilterer<,>)));
+    }
+}
 ````
 
 > 参阅[MongoDb集成文档](MongoDB.md)的 "设置默认仓储" 部分了解如何使用自定义类替换默认仓储.
\ No newline at end of file
diff --git a/docs/zh-Hans/Data-Transfer-Objects.md b/docs/zh-Hans/Data-Transfer-Objects.md
index eb844e7ea7..5f8a1bc527 100644
--- a/docs/zh-Hans/Data-Transfer-Objects.md
+++ b/docs/zh-Hans/Data-Transfer-Objects.md
@@ -210,15 +210,15 @@ namespace AbpDemo
         {
             //Create the query
             var query = _productRepository
-                .OrderBy(input.Sorting)
-                .Skip(input.SkipCount)
-                .Take(input.MaxResultCount);
+                .OrderBy(input.Sorting);
 
             //Get total count from the repository
             var totalCount = await query.CountAsync();
             
             //Get entities from the repository
-            List<Product> products = await query.ToListAsync();
+            List<Product> products = await query
+                .Skip(input.SkipCount)
+                .Take(input.MaxResultCount);.ToListAsync();
 
             //Map entities to DTOs
             List<ProductDto> productDtos =
diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/UrlBuilder.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/UrlBuilder.cs
index 4d77423c7f..2a990c70d6 100644
--- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/UrlBuilder.cs
+++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/UrlBuilder.cs
@@ -132,14 +132,14 @@ namespace Volo.Abp.Http.Client.DynamicProxying
             return true;
         }
 
-        private static string ConvertValueToString([NotNull] object value)
+        private static string ConvertValueToString([CanBeNull] object value)
         {
             if (value is DateTime dateTimeValue)
             {
                 return dateTimeValue.ToUniversalTime().ToString("O");
             }
 
-            return value.ToString();
+            return value?.ToString();
         }
     }
 }