diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.test.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.test.tsx
index ce6a3e9a8289..c6ac7a87ef26 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.test.tsx
@@ -10,6 +10,8 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+import { act, render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { ReactComponent as AllActivityIcon } from '../../assets/svg/all-activity.svg';
 import { ReactComponent as MailIcon } from '../../assets/svg/ic-mail.svg';
@@ -26,15 +28,29 @@ import {
   mockNonTaskInternalDestinationOptions,
   mockTaskInternalDestinationOptions,
 } from '../../mocks/AlertUtil.mock';
+import { searchData } from '../../rest/miscAPI';
 import {
   getAlertActionTypeDisplayName,
   getAlertsActionTypeIcon,
   getDisplayNameForEntities,
+  getFieldByArgumentType,
   getFilteredDestinationOptions,
   getFunctionDisplayName,
   listLengthValidator,
 } from './AlertsUtil';
 
+jest.mock('../../components/common/AsyncSelect/AsyncSelect', () => ({
+  AsyncSelect: jest
+    .fn()
+    .mockImplementation(({ api }: { api: () => void }) => (
+      <button onClick={() => api()}>AsyncSelect</button>
+    )),
+}));
+
+jest.mock('../../rest/miscAPI', () => ({
+  searchData: jest.fn(),
+}));
+
 describe('AlertsUtil tests', () => {
   it('getFunctionDisplayName should return correct text for matchAnyEntityFqn', () => {
     expect(getFunctionDisplayName('matchAnyEntityFqn')).toBe(
@@ -213,3 +229,279 @@ describe('AlertsUtil tests', () => {
     });
   });
 });
+
+describe('getFieldByArgumentType tests', () => {
+  it('should return correct fields for argumentType fqnList', async () => {
+    const field = getFieldByArgumentType(0, 'fqnList', 0, 'table');
+
+    render(field);
+
+    const selectDiv = screen.getByText('AsyncSelect');
+
+    await act(async () => {
+      userEvent.click(selectDiv);
+    });
+
+    expect(searchData).toHaveBeenCalledWith(
+      undefined,
+      1,
+      50,
+      '',
+      '',
+      '',
+      'table_search_index'
+    );
+  });
+
+  it('should return correct fields for argumentType domainList', async () => {
+    const field = getFieldByArgumentType(0, 'domainList', 0, 'container');
+
+    render(field);
+
+    const selectDiv = screen.getByText('AsyncSelect');
+
+    await act(async () => {
+      userEvent.click(selectDiv);
+    });
+
+    expect(searchData).toHaveBeenCalledWith(
+      undefined,
+      1,
+      50,
+      '',
+      '',
+      '',
+      'domain_search_index'
+    );
+  });
+
+  it('should return correct fields for argumentType tableNameList', async () => {
+    const field = getFieldByArgumentType(
+      0,
+      'tableNameList',
+      0,
+      'selectedTrigger'
+    );
+
+    render(field);
+
+    const selectDiv = screen.getByText('AsyncSelect');
+
+    await act(async () => {
+      userEvent.click(selectDiv);
+    });
+
+    expect(searchData).toHaveBeenCalledWith(
+      undefined,
+      1,
+      50,
+      '',
+      '',
+      '',
+      'table_search_index'
+    );
+  });
+
+  it('should return correct fields for argumentType ownerNameList', async () => {
+    const field = getFieldByArgumentType(
+      0,
+      'ownerNameList',
+      0,
+      'selectedTrigger'
+    );
+
+    render(field);
+
+    const selectDiv = screen.getByText('AsyncSelect');
+
+    await act(async () => {
+      userEvent.click(selectDiv);
+    });
+
+    expect(searchData).toHaveBeenCalledWith(
+      undefined,
+      1,
+      50,
+      'isBot:false',
+      '',
+      '',
+      ['team_search_index', 'user_search_index']
+    );
+  });
+
+  it('should return correct fields for argumentType updateByUserList', async () => {
+    const field = getFieldByArgumentType(
+      0,
+      'updateByUserList',
+      0,
+      'selectedTrigger'
+    );
+
+    render(field);
+
+    const selectDiv = screen.getByText('AsyncSelect');
+
+    await act(async () => {
+      userEvent.click(selectDiv);
+    });
+
+    expect(searchData).toHaveBeenCalledWith(
+      undefined,
+      1,
+      50,
+      '',
+      '',
+      '',
+      'user_search_index'
+    );
+  });
+
+  it('should return correct fields for argumentType userList', async () => {
+    const field = getFieldByArgumentType(0, 'userList', 0, 'selectedTrigger');
+
+    render(field);
+
+    const selectDiv = screen.getByText('AsyncSelect');
+
+    await act(async () => {
+      userEvent.click(selectDiv);
+    });
+
+    expect(searchData).toHaveBeenCalledWith(
+      undefined,
+      1,
+      50,
+      'isBot:false',
+      '',
+      '',
+      'user_search_index'
+    );
+  });
+
+  it('should return correct fields for argumentType eventTypeList', async () => {
+    const field = getFieldByArgumentType(
+      0,
+      'eventTypeList',
+      0,
+      'selectedTrigger'
+    );
+
+    render(field);
+
+    const selectDiv = screen.getByTestId('event-type-select');
+
+    expect(selectDiv).toBeInTheDocument();
+  });
+
+  it('should return correct fields for argumentType entityIdList', () => {
+    const field = getFieldByArgumentType(
+      0,
+      'entityIdList',
+      0,
+      'selectedTrigger'
+    );
+
+    render(field);
+
+    const selectDiv = screen.getByTestId('entity-id-select');
+
+    expect(selectDiv).toBeInTheDocument();
+  });
+
+  it('should return correct fields for argumentType pipelineStateList', () => {
+    const field = getFieldByArgumentType(
+      0,
+      'pipelineStateList',
+      0,
+      'selectedTrigger'
+    );
+
+    render(field);
+
+    const selectDiv = screen.getByTestId('pipeline-status-select');
+
+    expect(selectDiv).toBeInTheDocument();
+  });
+
+  it('should return correct fields for argumentType ingestionPipelineStateList', () => {
+    const field = getFieldByArgumentType(
+      0,
+      'ingestionPipelineStateList',
+      0,
+      'selectedTrigger'
+    );
+
+    render(field);
+
+    const selectDiv = screen.getByTestId('pipeline-status-select');
+
+    expect(selectDiv).toBeInTheDocument();
+  });
+
+  it('should return correct fields for argumentType testStatusList', () => {
+    const field = getFieldByArgumentType(
+      0,
+      'testStatusList',
+      0,
+      'selectedTrigger'
+    );
+
+    render(field);
+
+    const selectDiv = screen.getByTestId('test-status-select');
+
+    expect(selectDiv).toBeInTheDocument();
+  });
+
+  it('should return correct fields for argumentType testResultList', () => {
+    const field = getFieldByArgumentType(
+      0,
+      'testResultList',
+      0,
+      'selectedTrigger'
+    );
+
+    render(field);
+
+    const selectDiv = screen.getByTestId('test-result-select');
+
+    expect(selectDiv).toBeInTheDocument();
+  });
+
+  it('should return correct fields for argumentType testSuiteList', async () => {
+    const field = getFieldByArgumentType(
+      0,
+      'testSuiteList',
+      0,
+      'selectedTrigger'
+    );
+
+    render(field);
+
+    const selectDiv = screen.getByText('AsyncSelect');
+
+    await act(async () => {
+      userEvent.click(selectDiv);
+    });
+
+    expect(searchData).toHaveBeenCalledWith(
+      undefined,
+      1,
+      50,
+      '',
+      '',
+      '',
+      'test_suite_search_index'
+    );
+  });
+
+  it('should not return select component for random argumentType', () => {
+    const field = getFieldByArgumentType(0, 'unknown', 0, 'selectedTrigger');
+
+    render(field);
+
+    const selectDiv = screen.queryByText('AsyncSelect');
+
+    expect(selectDiv).toBeNull();
+  });
+});
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.tsx
index 06663d7d9bad..cc5cb28b1ea2 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.tsx
@@ -385,6 +385,91 @@ export const getDestinationConfigField = (
   }
 };
 
+export const getMessageFromArgumentName = (argumentName: string) => {
+  switch (argumentName) {
+    case 'fqnList':
+      return t('message.field-text-is-required', {
+        fieldText: t('label.entity-list', {
+          entity: t('label.fqn-uppercase'),
+        }),
+      });
+    case 'domainList':
+      return t('message.field-text-is-required', {
+        fieldText: t('label.entity-list', {
+          entity: t('label.domain'),
+        }),
+      });
+    case 'tableNameList':
+      return t('message.field-text-is-required', {
+        fieldText: t('label.entity-list', {
+          entity: t('label.entity-name', {
+            entity: t('label.table'),
+          }),
+        }),
+      });
+    case 'ownerNameList':
+      return t('message.field-text-is-required', {
+        fieldText: t('label.entity-list', {
+          entity: t('label.entity-name', {
+            entity: t('label.owner'),
+          }),
+        }),
+      });
+    case 'updateByUserList':
+    case 'userList':
+      return t('message.field-text-is-required', {
+        fieldText: t('label.entity-list', {
+          entity: t('label.entity-name', {
+            entity: t('label.user'),
+          }),
+        }),
+      });
+    case 'eventTypeList':
+      return t('message.field-text-is-required', {
+        fieldText: t('label.entity-list', {
+          entity: t('label.entity-name', {
+            entity: t('label.event'),
+          }),
+        }),
+      });
+    case 'entityIdList':
+      return t('message.field-text-is-required', {
+        fieldText: t('label.entity-list', {
+          entity: t('label.entity-id', {
+            entity: t('label.data-asset'),
+          }),
+        }),
+      });
+    case 'pipelineStateList':
+    case 'ingestionPipelineStateList':
+      return t('message.field-text-is-required', {
+        fieldText: t('label.entity-list', {
+          entity: t('label.pipeline-state'),
+        }),
+      });
+    case 'testStatusList':
+      return t('message.field-text-is-required', {
+        fieldText: t('label.entity-list', {
+          entity: t('label.test-suite-status'),
+        }),
+      });
+    case 'testResultList':
+      return t('message.field-text-is-required', {
+        fieldText: t('label.entity-list', {
+          entity: t('label.test-case-result'),
+        }),
+      });
+    case 'testSuiteList':
+      return t('message.field-text-is-required', {
+        fieldText: t('label.entity-list', {
+          entity: t('label.test-suite'),
+        }),
+      });
+    default:
+      return '';
+  }
+};
+
 export const getFieldByArgumentType = (
   fieldName: number,
   argument: string,
@@ -407,129 +492,65 @@ export const getFieldByArgumentType = (
   switch (argument) {
     case 'fqnList':
       field = (
-        <Col key="fqn-list-select" span={12}>
-          <Form.Item
-            name={[fieldName, 'arguments', index, 'input']}
-            rules={[
-              {
-                required: true,
-                message: t('message.field-text-is-required', {
-                  fieldText: t('label.entity-list', {
-                    entity: t('label.fqn-uppercase'),
-                  }),
-                }),
-              },
-            ]}>
-            <AsyncSelect
-              api={getEntityByFQN}
-              className="w-full"
-              data-testid="fqn-list-select"
-              maxTagTextLength={45}
-              mode="tags"
-              optionFilterProp="label"
-              placeholder={t('label.search-by-type', {
-                type: t('label.fqn-uppercase'),
-              })}
-              showArrow={false}
-            />
-          </Form.Item>
-        </Col>
+        <AsyncSelect
+          api={getEntityByFQN}
+          className="w-full"
+          data-testid="fqn-list-select"
+          maxTagTextLength={45}
+          mode="tags"
+          optionFilterProp="label"
+          placeholder={t('label.search-by-type', {
+            type: t('label.fqn-uppercase'),
+          })}
+          showArrow={false}
+        />
       );
 
       break;
 
     case 'domainList':
       field = (
-        <Col key="domain-select" span={12}>
-          <Form.Item
-            name={[fieldName, 'arguments', index, 'input']}
-            rules={[
-              {
-                required: true,
-                message: t('message.field-text-is-required', {
-                  fieldText: t('label.entity-list', {
-                    entity: t('label.domain'),
-                  }),
-                }),
-              },
-            ]}>
-            <AsyncSelect
-              api={getDomainOptions}
-              className="w-full"
-              data-testid="domain-select"
-              mode="multiple"
-              placeholder={t('label.search-by-type', {
-                type: t('label.domain-lowercase'),
-              })}
-            />
-          </Form.Item>
-        </Col>
+        <AsyncSelect
+          api={getDomainOptions}
+          className="w-full"
+          data-testid="domain-select"
+          mode="multiple"
+          placeholder={t('label.search-by-type', {
+            type: t('label.domain-lowercase'),
+          })}
+        />
       );
 
       break;
 
     case 'tableNameList':
       field = (
-        <Col key="table-name-select" span={12}>
-          <Form.Item
-            name={[fieldName, 'arguments', index, 'input']}
-            rules={[
-              {
-                required: true,
-                message: t('message.field-text-is-required', {
-                  fieldText: t('label.entity-list', {
-                    entity: t('label.entity-name', {
-                      entity: t('label.table'),
-                    }),
-                  }),
-                }),
-              },
-            ]}>
-            <AsyncSelect
-              api={getTableSuggestions}
-              className="w-full"
-              data-testid="table-name-select"
-              maxTagTextLength={45}
-              mode="tags"
-              optionFilterProp="label"
-              placeholder={t('label.search-by-type', {
-                type: t('label.table-lowercase'),
-              })}
-            />
-          </Form.Item>
-        </Col>
+        <AsyncSelect
+          api={getTableSuggestions}
+          className="w-full"
+          data-testid="table-name-select"
+          maxTagTextLength={45}
+          mode="tags"
+          optionFilterProp="label"
+          placeholder={t('label.search-by-type', {
+            type: t('label.table-lowercase'),
+          })}
+        />
       );
 
       break;
 
     case 'ownerNameList':
       field = (
-        <Col key="owner-select" span={12}>
-          <Form.Item
-            name={[fieldName, 'arguments', index, 'input']}
-            rules={[
-              {
-                required: true,
-                message: t('message.field-text-is-required', {
-                  fieldText: t('label.entity-list', {
-                    entity: t('label.entity-name', {
-                      entity: t('label.owner'),
-                    }),
-                  }),
-                }),
-              },
-            ]}>
-            <AsyncSelect
-              api={getOwnerOptions}
-              className="w-full"
-              data-testid="owner-name-select"
-              mode="multiple"
-              placeholder={t('label.search-by-type', {
-                type: t('label.owner-lowercase'),
-              })}
-            />
-          </Form.Item>
-        </Col>
+        <AsyncSelect
+          api={getOwnerOptions}
+          className="w-full"
+          data-testid="owner-name-select"
+          mode="multiple"
+          placeholder={t('label.search-by-type', {
+            type: t('label.owner-lowercase'),
+          })}
+        />
       );
 
       break;
@@ -537,248 +558,126 @@ export const getFieldByArgumentType = (
     case 'updateByUserList':
     case 'userList':
       field = (
-        <Col key="user-select" span={12}>
-          <Form.Item
-            name={[fieldName, 'arguments', index, 'input']}
-            rules={[
-              {
-                required: true,
-                message: t('message.field-text-is-required', {
-                  fieldText: t('label.entity-list', {
-                    entity: t('label.entity-name', {
-                      entity: t('label.user'),
-                    }),
-                  }),
-                }),
-              },
-            ]}>
-            <AsyncSelect
-              api={getUserBotOptions}
-              className="w-full"
-              data-testid="user-name-select"
-              mode="multiple"
-              placeholder={t('label.search-by-type', {
-                type: t('label.user'),
-              })}
-            />
-          </Form.Item>
-        </Col>
+        <AsyncSelect
+          api={
+            argument === 'updateByUserList'
+              ? getUserBotOptions // For updateByUserList, we need to show bot users as well
+              : getUserOptions // For userList, which is an argument for `conversation` filters we need to show only non-bot users
+          }
+          className="w-full"
+          data-testid="user-name-select"
+          mode="multiple"
+          placeholder={t('label.search-by-type', {
+            type: t('label.user'),
+          })}
+        />
       );
 
       break;
 
     case 'eventTypeList':
       field = (
-        <Col key="event-type-select" span={12}>
-          <Form.Item
-            name={[fieldName, 'arguments', index, 'input']}
-            rules={[
-              {
-                required: true,
-                message: t('message.field-text-is-required', {
-                  fieldText: t('label.entity-list', {
-                    entity: t('label.entity-name', {
-                      entity: t('label.event'),
-                    }),
-                  }),
-                }),
-              },
-            ]}>
-            <Select
-              className="w-full"
-              data-testid="event-type-select"
-              mode="multiple"
-              options={getSelectOptionsFromEnum(EventType)}
-              placeholder={t('label.search-by-type', {
-                type: t('label.event-type-lowercase'),
-              })}
-            />
-          </Form.Item>
-        </Col>
+        <Select
+          className="w-full"
+          data-testid="event-type-select"
+          mode="multiple"
+          options={getSelectOptionsFromEnum(EventType)}
+          placeholder={t('label.search-by-type', {
+            type: t('label.event-type-lowercase'),
+          })}
+        />
       );
 
       break;
 
     case 'entityIdList':
       field = (
-        <Col key="entity-id-select" span={12}>
-          <Form.Item
-            name={[fieldName, 'arguments', index, 'input']}
-            rules={[
-              {
-                required: true,
-                message: t('message.field-text-is-required', {
-                  fieldText: t('label.entity-list', {
-                    entity: t('label.entity-id', {
-                      entity: t('label.data-asset'),
-                    }),
-                  }),
-                }),
-              },
-            ]}>
-            <Select
-              className="w-full"
-              data-testid="entity-id-select"
-              mode="tags"
-              open={false}
-              placeholder={t('label.search-by-type', {
-                type: t('label.entity-id', {
-                  entity: t('label.data-asset'),
-                }),
-              })}
-            />
-          </Form.Item>
-        </Col>
+        <Select
+          className="w-full"
+          data-testid="entity-id-select"
+          mode="tags"
+          open={false}
+          placeholder={t('label.search-by-type', {
+            type: t('label.entity-id', {
+              entity: t('label.data-asset'),
+            }),
+          })}
+        />
       );
 
       break;
 
     case 'pipelineStateList':
       field = (
-        <Col key="pipeline-state-select" span={12}>
-          <Form.Item
-            name={[fieldName, 'arguments', index, 'input']}
-            rules={[
-              {
-                required: true,
-                message: t('message.field-text-is-required', {
-                  fieldText: t('label.entity-list', {
-                    entity: t('label.pipeline-state'),
-                  }),
-                }),
-              },
-            ]}>
-            <Select
-              className="w-full"
-              data-testid="pipeline-status-select"
-              mode="multiple"
-              options={getSelectOptionsFromEnum(StatusType)}
-              placeholder={t('label.select-field', {
-                field: t('label.pipeline-state'),
-              })}
-            />
-          </Form.Item>
-        </Col>
+        <Select
+          className="w-full"
+          data-testid="pipeline-status-select"
+          mode="multiple"
+          options={getSelectOptionsFromEnum(StatusType)}
+          placeholder={t('label.select-field', {
+            field: t('label.pipeline-state'),
+          })}
+        />
       );
 
       break;
 
     case 'ingestionPipelineStateList':
       field = (
-        <Col key="pipeline-state-select" span={11}>
-          <Form.Item
-            name={[fieldName, 'arguments', index, 'input']}
-            rules={[
-              {
-                required: true,
-                message: t('message.field-text-is-required', {
-                  fieldText: t('label.entity-list', {
-                    entity: t('label.pipeline-state'),
-                  }),
-                }),
-              },
-            ]}>
-            <Select
-              className="w-full"
-              data-testid="pipeline-status-select"
-              mode="multiple"
-              options={getSelectOptionsFromEnum(PipelineState)}
-              placeholder={t('label.select-field', {
-                field: t('label.pipeline-state'),
-              })}
-            />
-          </Form.Item>
-        </Col>
+        <Select
+          className="w-full"
+          data-testid="pipeline-status-select"
+          mode="multiple"
+          options={getSelectOptionsFromEnum(PipelineState)}
+          placeholder={t('label.select-field', {
+            field: t('label.pipeline-state'),
+          })}
+        />
       );
 
       break;
 
     case 'testStatusList':
       field = (
-        <Col key="test-status-select" span={12}>
-          <Form.Item
-            name={[fieldName, 'arguments', index, 'input']}
-            rules={[
-              {
-                required: true,
-                message: t('message.field-text-is-required', {
-                  fieldText: t('label.entity-list', {
-                    entity: t('label.test-suite-status'),
-                  }),
-                }),
-              },
-            ]}>
-            <Select
-              className="w-full"
-              data-testid="test-status-select"
-              mode="multiple"
-              options={getSelectOptionsFromEnum(TestCaseStatus)}
-              placeholder={t('label.select-field', {
-                field: t('label.test-suite-status'),
-              })}
-            />
-          </Form.Item>
-        </Col>
+        <Select
+          className="w-full"
+          data-testid="test-status-select"
+          mode="multiple"
+          options={getSelectOptionsFromEnum(TestCaseStatus)}
+          placeholder={t('label.select-field', {
+            field: t('label.test-suite-status'),
+          })}
+        />
       );
 
       break;
 
     case 'testResultList':
       field = (
-        <Col key="test-result-select" span={12}>
-          <Form.Item
-            name={[fieldName, 'arguments', index, 'input']}
-            rules={[
-              {
-                required: true,
-                message: t('message.field-text-is-required', {
-                  fieldText: t('label.entity-list', {
-                    entity: t('label.test-case-result'),
-                  }),
-                }),
-              },
-            ]}>
-            <Select
-              className="w-full"
-              data-testid="test-result-select"
-              mode="multiple"
-              options={getSelectOptionsFromEnum(TestCaseStatus)}
-              placeholder={t('label.select-field', {
-                field: t('label.test-case-result'),
-              })}
-            />
-          </Form.Item>
-        </Col>
+        <Select
+          className="w-full"
+          data-testid="test-result-select"
+          mode="multiple"
+          options={getSelectOptionsFromEnum(TestCaseStatus)}
+          placeholder={t('label.select-field', {
+            field: t('label.test-case-result'),
+          })}
+        />
       );
 
       break;
 
     case 'testSuiteList':
       field = (
-        <Col key="test-suite-select" span={12}>
-          <Form.Item
-            name={[fieldName, 'arguments', index, 'input']}
-            rules={[
-              {
-                required: true,
-                message: t('message.field-text-is-required', {
-                  fieldText: t('label.entity-list', {
-                    entity: t('label.test-suite'),
-                  }),
-                }),
-              },
-            ]}>
-            <AsyncSelect
-              api={getTestSuiteSuggestions}
-              className="w-full"
-              data-testid="test-suite-select"
-              mode="multiple"
-              placeholder={t('label.search-by-type', {
-                type: t('label.test-suite'),
-              })}
-            />
-          </Form.Item>
-        </Col>
+        <AsyncSelect
+          api={getTestSuiteSuggestions}
+          className="w-full"
+          data-testid="test-suite-select"
+          mode="multiple"
+          placeholder={t('label.search-by-type', {
+            type: t('label.test-suite'),
+          })}
+        />
       );
 
       break;
@@ -788,7 +687,18 @@ export const getFieldByArgumentType = (
 
   return (
     <>
-      {field}
+      <Col key={argument} span={12}>
+        <Form.Item
+          name={[fieldName, 'arguments', index, 'input']}
+          rules={[
+            {
+              required: true,
+              message: getMessageFromArgumentName(argument),
+            },
+          ]}>
+          {field}
+        </Form.Item>
+      </Col>
       <Form.Item
         hidden
         dependencies={[fieldName, 'arguments', index, 'input']}