diff --git a/IRaCIS.Core.Test/LiquidTemplate/EntityService.liquid b/IRaCIS.Core.Test/LiquidTemplate/EntityService.liquid
index c371c2227..7a5a2df57 100644
--- a/IRaCIS.Core.Test/LiquidTemplate/EntityService.liquid
+++ b/IRaCIS.Core.Test/LiquidTemplate/EntityService.liquid
@@ -24,7 +24,14 @@ public class {{TableName}}Service(IRepository<{{TableName}}> {{LowercaseReposito
 	{
 			
 		    var {{LowercaseQueryableName}} ={{LowercaseRepositoryName}}
-                                        .ProjectTo<{{TableNameView}}>(_mapper.ConfigurationProvider);
+{% for field in QueryListFieldList -%}
+    {% if field.CSharpType == "string" -%}
+                .WhereIf(!string.IsNullOrEmpty(inQuery.{{ field.FieldName }}), t => t.{{ field.FieldName }}.Contains(inQuery.{{ field.FieldName }}))
+    {%- elsif field.CSharpType != "DateTime" -%}
+                .WhereIf(inQuery.{{ field.FieldName }} != null, t => t.{{ field.FieldName }} == inQuery.{{ field.FieldName }})
+    {%- endif %}
+{% endfor -%}
+                .ProjectTo<{{TableNameView}}>(_mapper.ConfigurationProvider);
 
             var pageList= await {{LowercaseQueryableName}}.ToPagedListAsync(inQuery);
 
@@ -37,7 +44,14 @@ public class {{TableName}}Service(IRepository<{{TableName}}> {{LowercaseReposito
 
 		
 		    var {{LowercaseQueryableName}} ={{LowercaseRepositoryName}}
-			                                .ProjectTo<{{TableNameView}}>(_mapper.ConfigurationProvider);
+{% for field in QueryListFieldList -%}
+    {% if field.CSharpType == "string" -%}
+                .WhereIf(!string.IsNullOrEmpty(inQuery.{{ field.FieldName }}), t => t.{{ field.FieldName }}.Contains(inQuery.{{ field.FieldName }}))
+    {%- elsif field.CSharpType != "DateTime" -%}
+                .WhereIf(inQuery.{{ field.FieldName }} != null, t => t.{{ field.FieldName }} == inQuery.{{ field.FieldName }})
+    {%- endif %}
+{% endfor -%}
+			        .ProjectTo<{{TableNameView}}>(_mapper.ConfigurationProvider);
              
 			return await {{LowercaseQueryableName}}.ToListAsync();
 	}