diff --git a/apps/trigger/serializers/trigger.py b/apps/trigger/serializers/trigger.py
index bf10479d874..ddcbb9c54e7 100644
--- a/apps/trigger/serializers/trigger.py
+++ b/apps/trigger/serializers/trigger.py
@@ -82,23 +82,19 @@ def validate_user_input_field_list(self, value):
 
 
 class ToolTaskParameterSerializer(serializers.Serializer):
-    input_field_list = serializers.JSONField(required=False)
 
-    def validate_input_field_list(self, value):
-        if not value:
-            return value
-        if not isinstance(value, dict):
-            raise serializers.ValidationError(_("input_field_list must be a dict"))
+    def to_internal_value(self, data):
+        if not isinstance(data, dict):
+            raise serializers.ValidationError("must be a dict")
 
-        for key, val in value.items():
+        validated = {}
+        for key, val in data.items():
             serializer = InputField(data=val)
             if not serializer.is_valid():
-                raise serializers.ValidationError({
-                    key: serializer.errors
-                })
-
-        return value
+                raise serializers.ValidationError({key: serializer.errors})
+            validated[key] = serializer.validated_data
 
+        return validated
 
 class TriggerValidationMixin:
 
@@ -607,7 +603,7 @@ class TriggerQuerySerializer(serializers.Serializer):
     def get_query_set(self):
         trigger_query_set = QuerySet(
             model=get_dynamics_model({
-                'name': models.CharField(),
+                't.name': models.CharField(),
                 'trigger_type': models.CharField(),
                 't.workspace_id': models.CharField(),
                 't.is_active': models.BooleanField(),
@@ -618,7 +614,7 @@ def get_query_set(self):
         }))
         trigger_query_set = trigger_query_set.filter(**{'t.workspace_id': self.data.get("workspace_id")})
         if self.data.get("name"):
-            trigger_query_set = trigger_query_set.filter(name__contains=self.data.get("name"))
+            trigger_query_set = trigger_query_set.filter(**{'t.name__icontains': self.data.get("name")})
         if self.data.get("type"):
             trigger_query_set = trigger_query_set.filter(trigger_type=self.data.get("type"))
         if self.data.get("is_active") is not None:
diff --git a/apps/trigger/sql/get_trigger_page_list.sql b/apps/trigger/sql/get_trigger_page_list.sql
index 59e944e9fc5..79c6094bad3 100644
--- a/apps/trigger/sql/get_trigger_page_list.sql
+++ b/apps/trigger/sql/get_trigger_page_list.sql
@@ -2,7 +2,7 @@ WITH scheduler AS (SELECT SPLIT_PART(id, ':', 2) as trigger_id,
                           id,
                           next_run_time
                    FROM django_apscheduler_djangojob
-                   WHERE id LIKE 'trigger:%')
+                   WHERE id LIKE 'trigger:%%')
 SELECT *
 FROM (SELECT t.id,
              t.workspace_id,