diff --git a/src/components/CriteriaForm/CriteriaForm.tsx b/src/components/CriteriaForm/CriteriaForm.tsx
index de7cfa86b..74ea59458 100644
--- a/src/components/CriteriaForm/CriteriaForm.tsx
+++ b/src/components/CriteriaForm/CriteriaForm.tsx
@@ -15,32 +15,33 @@ import {
 } from '@taskany/bricks/harmony';
 
 import { GoalSelect } from '../GoalSelect/GoalSelect';
-import { getStateProps, GoalBadge } from '../GoalBadge';
+import { GoalBadge } from '../GoalBadge';
 import { FilterAutoCompleteInput } from '../FilterAutoCompleteInput/FilterAutoCompleteInput';
 import { AddInlineTrigger } from '../AddInlineTrigger/AddInlineTrigger';
 import { StateDot } from '../StateDot/StateDot';
-import { TaskBadge, TaskBadgeIcon } from '../TaskBadge/TaskBadge';
+import { JiraTaskBadge, JiraTaskBadgeIcon } from '../JiraTaskBadge/JiraTaskBadge';
 
 import { tr } from './CriteriaForm.i18n';
 import s from './CriteriaForm.module.css';
 
-type GoalStateProps = ComponentProps<typeof StateDot>['state'];
-type TaskTypeProps = NonNullable<ComponentProps<typeof TaskBadge>['type']>;
-type TaskStateProps = NonNullable<ComponentProps<typeof TaskBadge>['state']>;
-
-interface SuggestItem {
-    id: string;
-    title: string;
-    state?: GoalStateProps | TaskStateProps | null;
-    type?: TaskTypeProps | null;
-    _shortId: string;
-}
-
-const isGoalStateProps = (props: unknown): props is GoalStateProps =>
-    typeof props === 'object' && props != null && 'lightForeground' in props && 'darkForeground' in props;
-
-const isTaskStateProps = (props: unknown): props is TaskStateProps =>
-    typeof props === 'object' && props != null && 'src' in props && 'title' in props;
+type GoalStateProps = NonNullable<ComponentProps<typeof StateDot>['state']>;
+type TaskTypeProps = NonNullable<ComponentProps<typeof JiraTaskBadge>['type']>;
+
+type SuggestItem =
+    | {
+          itemType: 'goal';
+          id: string;
+          title: string;
+          state: GoalStateProps | null;
+          _shortId: string;
+      }
+    | {
+          itemType: 'task';
+          id: string;
+          title: string;
+          type: TaskTypeProps;
+          key: string;
+      };
 
 interface ValidityData {
     title: string[];
@@ -101,7 +102,7 @@ function patchZodSchema<T extends FormValues>(
                 mode: z.literal('task'),
                 id: z.string(),
                 selected: z.object({
-                    externalKey: z.string(),
+                    key: z.string(),
                 }),
             }),
         ])
@@ -241,12 +242,9 @@ const CriteriaTitleField: React.FC<CriteriaTitleFieldProps> = ({
     const { selected, title } = errors;
 
     const icon = useMemo(() => {
-        if (selectedItem == null) {
-            return null;
-        }
-
+        const existItem = selectedItem != null;
         if (mode === 'goal') {
-            if (isGoalStateProps(selectedItem.state)) {
+            if (existItem && selectedItem?.itemType === 'goal') {
                 return <StateDot size="s" state={selectedItem.state} view="stroke" />;
             }
 
@@ -254,8 +252,8 @@ const CriteriaTitleField: React.FC<CriteriaTitleFieldProps> = ({
         }
 
         if (mode === 'task') {
-            if (isTaskStateProps(selectedItem.type)) {
-                return <TaskBadgeIcon src={selectedItem.type.src} />;
+            if (existItem && selectedItem?.itemType === 'task') {
+                return <JiraTaskBadgeIcon src={selectedItem.type.src} />;
             }
 
             return <IconDatabaseOutline size="s" />;
@@ -303,14 +301,6 @@ const CriteriaTitleField: React.FC<CriteriaTitleFieldProps> = ({
     );
 };
 
-const isGoalProps = (props: unknown): props is React.ComponentProps<typeof GoalBadge> => {
-    return typeof props === 'object' && props != null && '_shortId' in props;
-};
-
-const isTaskProps = (props: unknown): props is React.ComponentProps<typeof TaskBadge> => {
-    return typeof props === 'object' && props != null && 'type' in props;
-};
-
 export const CriteriaForm = ({
     onInputChange,
     onItemChange,
@@ -444,18 +434,12 @@ export const CriteriaForm = ({
                 renderItem={(props) => {
                     const renderData = props.item;
 
-                    if (mode === 'goal' && isGoalProps(renderData)) {
-                        return (
-                            <GoalBadge
-                                title={renderData.title}
-                                state={getStateProps(renderData?.state)}
-                                className={s.GoalBadge}
-                            />
-                        );
+                    if (mode === 'goal' && renderData.itemType === 'goal') {
+                        return <GoalBadge title={renderData.title} state={renderData.state} className={s.GoalBadge} />;
                     }
 
-                    if (mode === 'task' && isTaskProps(renderData)) {
-                        return <TaskBadge {...renderData} />;
+                    if (mode === 'task' && renderData.itemType === 'task') {
+                        return <JiraTaskBadge {...renderData} />;
                     }
                 }}
             >
diff --git a/src/components/GoalCriteria/GoalCriteria.tsx b/src/components/GoalCriteria/GoalCriteria.tsx
index e7a450d5a..6088bb959 100644
--- a/src/components/GoalCriteria/GoalCriteria.tsx
+++ b/src/components/GoalCriteria/GoalCriteria.tsx
@@ -34,8 +34,8 @@ import { ActivityFeedItem } from '../ActivityFeed/ActivityFeed';
 import { IssueMeta } from '../IssueMeta/IssueMeta';
 import { Circle } from '../Circle/Circle';
 import { routes } from '../../hooks/router';
-import { GoalBadge } from '../GoalBadge';
-import { TaskBadge } from '../TaskBadge/TaskBadge';
+import { getStateProps, GoalBadge } from '../GoalBadge';
+import { JiraTaskBadge } from '../JiraTaskBadge/JiraTaskBadge';
 import { safeUserData } from '../../utils/getUserName';
 import { UserBadge } from '../UserBadge/UserBadge';
 import { ActivityByIdReturnType } from '../../../trpc/inferredTypes';
@@ -48,7 +48,7 @@ import { tr } from './GoalCriteria.i18n';
 type GoalCriteriaSuggestProps = React.ComponentProps<typeof GoalCriteriaSuggest>;
 
 type GoalStateProps = NonNullable<React.ComponentProps<typeof GoalBadge>['state']>;
-type ExternalTaskTypeProps = React.ComponentProps<typeof TaskBadge>['type'];
+type ExternalTaskTypeProps = NonNullable<React.ComponentProps<typeof JiraTaskBadge>['type']>;
 type CriteriaUpdateDataMode = NonNullable<GoalCriteriaSuggestProps['defaultMode']>;
 interface CriteriaProps {
     title: string;
@@ -70,10 +70,11 @@ interface GoalCriteriaProps extends CriteriaProps {
 
 interface ExternalTaskCriteriaProps extends CriteriaProps {
     externalTask: {
+        id: string;
         title: string;
         externalKey: string;
         project: string;
-        type?: ExternalTaskTypeProps;
+        type: ExternalTaskTypeProps;
         state?: {
             color: string | null;
             title: string;
@@ -85,7 +86,7 @@ interface ExternalTaskCriteriaProps extends CriteriaProps {
 
 type UnionCriteria = CriteriaProps | GoalCriteriaProps | ExternalTaskCriteriaProps;
 
-type CanBeNullableValue<T extends { [key: string]: any }> = {
+type CanBeNullableValue<T extends { [key: string]: unknown }> = {
     [K in keyof T]: T[K] | null;
 };
 
@@ -224,7 +225,7 @@ const ExternalTaskCriteria = ({ title, externalTask, weight, isDone }: Omit<Exte
     return (
         <>
             <TableCell className={classes.GoalCriteriaTitleCell} width={200}>
-                <TaskBadge
+                <JiraTaskBadge
                     title={title}
                     state={
                         externalTask.state
@@ -272,31 +273,12 @@ const GoalCriteria = ({ title, goal, weight, isDone }: Omit<GoalCriteriaProps, '
         [setPreview, title, goal],
     );
 
-    const goalState = useMemo(() => {
-        if (goal.state == null) {
-            return null;
-        }
-
-        const {
-            state: { lightForeground, darkForeground },
-        } = goal;
-
-        if (lightForeground && darkForeground) {
-            return {
-                lightForeground,
-                darkForeground,
-            };
-        }
-
-        return null;
-    }, [goal]);
-
     return (
         <>
             <TableCell className={classes.GoalCriteriaTitleCell} width={200}>
                 <GoalBadge
                     title={title}
-                    state={goalState}
+                    state={getStateProps(goal.state)}
                     href={routes.goal(goal.shortId)}
                     onClick={handleGoalCriteriaClick}
                     progress={goal.progress}
@@ -446,6 +428,7 @@ export const Criteria: React.FC<
                         title: props.title,
                         state: props.goal.state,
                         _shortId: props.goal.shortId,
+                        itemType: 'goal',
                     },
                 },
             ];
@@ -460,11 +443,11 @@ export const Criteria: React.FC<
                     title: props.title,
                     weight: props.weight ? `${props.weight}` : '',
                     selected: {
-                        id: props.externalTask.externalKey,
-                        _shortId: props.externalTask.externalKey,
+                        id: props.externalTask.id,
                         title: props.externalTask.title,
-                        state: props.externalTask.state,
-                        externalKey: props.externalTask.externalKey,
+                        type: props.externalTask.type,
+                        key: props.externalTask.externalKey,
+                        itemType: 'task',
                     },
                 },
             ];
@@ -503,7 +486,7 @@ export const Criteria: React.FC<
                     valuesToUpdate.selected.id = values.selected.id;
                     break;
                 case 'task':
-                    valuesToUpdate.selected.externalKey = values.selected.externalKey;
+                    valuesToUpdate.selected.externalKey = values.selected.key;
                     break;
                 default:
             }
diff --git a/src/components/GoalCriteriaSuggest.tsx b/src/components/GoalCriteriaSuggest.tsx
index a89f11000..3d643bd96 100644
--- a/src/components/GoalCriteriaSuggest.tsx
+++ b/src/components/GoalCriteriaSuggest.tsx
@@ -5,6 +5,7 @@ import { useGoalResource } from '../hooks/useGoalResource';
 
 import { CriteriaForm, useCriteriaValidityData } from './CriteriaForm/CriteriaForm';
 import { dispatchPreviewUpdateEvent } from './GoalPreview/GoalPreviewProvider';
+import { getStateProps } from './GoalBadge';
 
 type SuggestItems = React.ComponentProps<typeof CriteriaForm>['items'];
 
@@ -41,6 +42,7 @@ interface GoalCriteriaSuggestProps {
     validityData: React.ComponentProps<typeof CriteriaForm>['validityData'];
     onGoalSelect?: (goal: { id: string }) => void;
 }
+type SuggestItem = React.ComponentProps<typeof CriteriaForm>['items'][number];
 
 export const GoalCriteriaSuggest: React.FC<GoalCriteriaSuggestProps> = ({
     id,
@@ -83,7 +85,7 @@ export const GoalCriteriaSuggest: React.FC<GoalCriteriaSuggestProps> = ({
         { enabled: mode === 'goal' && shouldEnabledQuery, cacheTime: 0 },
     );
 
-    const { data: issues = [] } = trpc.external.search.useQuery(
+    const { data: issues = [] } = trpc.jira.search.useQuery(
         {
             value: query as string,
             limit: 5,
@@ -94,7 +96,7 @@ export const GoalCriteriaSuggest: React.FC<GoalCriteriaSuggestProps> = ({
         },
     );
 
-    const itemsToRender = useMemo(() => {
+    const itemsToRender = useMemo<SuggestItem[]>(() => {
         if (selectedGoal?.title === query || mode === 'simple') {
             return [];
         }
@@ -103,20 +105,15 @@ export const GoalCriteriaSuggest: React.FC<GoalCriteriaSuggestProps> = ({
             return goals.map(({ id, title, state, _shortId }) => ({
                 id,
                 title,
-                state:
-                    state?.lightForeground != null && state?.darkForeground != null
-                        ? {
-                              lightForeground: state.lightForeground,
-                              darkForeground: state.darkForeground,
-                          }
-                        : null,
+                state: getStateProps(state),
                 _shortId,
+                itemType: 'goal',
             }));
         }
 
         return issues.map((issue) => ({
             ...issue,
-            _shortId: issue.externalKey,
+            key: issue.externalKey,
             state: null,
             id: issue.externalId,
             title: issue.title,
@@ -124,6 +121,7 @@ export const GoalCriteriaSuggest: React.FC<GoalCriteriaSuggestProps> = ({
                 title: issue.type,
                 src: issue.typeIconUrl,
             },
+            itemType: 'task' as const,
         }));
     }, [goals, selectedGoal, query, mode, issues]);
 
diff --git a/src/components/TaskBadge/TaskBadge.module.css b/src/components/JiraTaskBadge/JiraTaskBadge.module.css
similarity index 83%
rename from src/components/TaskBadge/TaskBadge.module.css
rename to src/components/JiraTaskBadge/JiraTaskBadge.module.css
index 2b266fc18..ded009049 100644
--- a/src/components/TaskBadge/TaskBadge.module.css
+++ b/src/components/JiraTaskBadge/JiraTaskBadge.module.css
@@ -1,14 +1,14 @@
-.TaskBadgeType {
+.JiraTaskBadgeType {
     --badge-icon-size: 16px;
     font-size: 16px;
 }
 
-.TaskBadgeProjectName {
+.JiraTaskBadgeProjectName {
     /* must be used of current font-size, but not root font-size */
     margin-left: 0.25em;
 }
 
-.TaskBadgeState {
+.JiraTaskBadgeState {
     color: white;
     background-color: var(--task-badge-color, var(--gray-500));
     width: var(--font-size-m);
@@ -21,7 +21,7 @@
     border-radius: var(--radius-s);
 }
 
-.TaskBadgeStateSymbol {
+.JiraTaskBadgeStateSymbol {
     vertical-align: 0.125em;
     line-height: 1rem;
 }
\ No newline at end of file
diff --git a/src/components/TaskBadge/TaskBadge.tsx b/src/components/JiraTaskBadge/JiraTaskBadge.tsx
similarity index 58%
rename from src/components/TaskBadge/TaskBadge.tsx
rename to src/components/JiraTaskBadge/JiraTaskBadge.tsx
index e83af4f48..6ec476d01 100644
--- a/src/components/TaskBadge/TaskBadge.tsx
+++ b/src/components/JiraTaskBadge/JiraTaskBadge.tsx
@@ -5,9 +5,9 @@ import { BaseIcon } from '@taskany/icons';
 
 import { NextLink } from '../NextLink';
 
-import styles from './TaskBadge.module.css';
+import styles from './JiraTaskBadge.module.css';
 
-interface TaskBadgeProps extends Omit<React.HTMLAttributes<HTMLSpanElement>, 'color' | 'title'> {
+interface JiraTaskBadgeProps extends Omit<React.HTMLAttributes<HTMLSpanElement>, 'color' | 'title'> {
     title: React.ReactNode;
     href?: string;
     type?: {
@@ -25,7 +25,7 @@ interface TaskBadgeProps extends Omit<React.HTMLAttributes<HTMLSpanElement>, 'co
     project?: string;
 }
 
-export const TaskBadgeIcon: React.FC<{ src: string }> = ({ src }) => (
+export const JiraTaskBadgeIcon: React.FC<{ src: string }> = ({ src }) => (
     <BaseIcon
         className={styles.TaskBadgeType}
         size="s"
@@ -37,14 +37,14 @@ export const TaskBadgeIcon: React.FC<{ src: string }> = ({ src }) => (
     />
 );
 
-export const TaskBadgeState: React.FC<{ state: string; color?: string | null }> = ({ state, color }) => {
+export const JiraTaskBadgeState: React.FC<{ state: string; color?: string | null }> = ({ state, color }) => {
     const style = color ? ({ '--task-badge-color': color.split('-')[0] } as React.CSSProperties) : {};
     return (
         <Tooltip
             placement="top"
             target={
-                <span style={style} className={styles.TaskBadgeState}>
-                    <Text size="xs" as="span" className={styles.TaskBadgeStateSymbol}>
+                <span style={style} className={styles.JiraTaskBadgeState}>
+                    <Text size="xs" as="span" className={styles.JiraTaskBadgeStateSymbol}>
                         {state.slice(0, 1).toUpperCase()}
                     </Text>
                 </span>
@@ -55,7 +55,20 @@ export const TaskBadgeState: React.FC<{ state: string; color?: string | null }>
     );
 };
 
-export const TaskBadge: React.FC<TaskBadgeProps> = ({
+const JiraTaskBadgeLabel: React.FC<Pick<JiraTaskBadgeProps, 'title' | 'project'>> = ({ title, project }) => {
+    return (
+        <>
+            {title}
+            {nullable(project, (p) => (
+                <Text className={styles.JiraTaskBadgeProjectName} as="span" color="var(--gray-500)">
+                    ({p})
+                </Text>
+            ))}
+        </>
+    );
+};
+
+export const JiraTaskBadge: React.FC<JiraTaskBadgeProps> = ({
     href,
     title,
     children,
@@ -72,35 +85,19 @@ export const TaskBadge: React.FC<TaskBadgeProps> = ({
             iconLeft={nullable(
                 type?.src,
                 (src) => (
-                    <TaskBadgeIcon src={src} />
+                    <JiraTaskBadgeIcon src={src} />
                 ),
-                nullable(state, (s) => <TaskBadgeState state={s.title} color={s.color} />),
+                nullable(state, (s) => <JiraTaskBadgeState state={s.title} color={s.color} />),
             )}
             iconRight={children}
             text={nullable(
                 href,
                 (h) => (
                     <NextLink href={h} target="_blank" view="secondary" onClick={onClick}>
-                        {title}
-                        {nullable(project, (p) => (
-                            <>
-                                <Text className={styles.TaskBadgeProjectName} as="span" color="var(--gray8)">
-                                    ({p})
-                                </Text>
-                            </>
-                        ))}
+                        <JiraTaskBadgeLabel title={title} project={project} />
                     </NextLink>
                 ),
-                <>
-                    {title}
-                    {nullable(project, (p) => (
-                        <>
-                            <Text className={styles.TaskBadgeProjectName} as="span" color="var(--gray8)">
-                                ({p})
-                            </Text>
-                        </>
-                    ))}
-                </>,
+                <JiraTaskBadgeLabel title={title} project={project} />,
             )}
             action="dynamic"
             {...attrs}
diff --git a/src/utils/integration/jira.ts b/src/utils/integration/jira.ts
index bad369111..9fab7bde8 100644
--- a/src/utils/integration/jira.ts
+++ b/src/utils/integration/jira.ts
@@ -110,7 +110,7 @@ class JiraService extends JiraApi {
         );
     }
 
-    /** start overriding private instamce methods */
+    /** start overriding private instance methods */
     // @ts-ignore
     private async doRequest<T extends JiraApi.JsonResponse>(options: any): Promise<T> {
         if (isDebugEnabled) {
@@ -134,14 +134,7 @@ class JiraService extends JiraApi {
         // @ts-ignore
         return this.makeRequestHeader(url, options);
     }
-    /** end overriding private instamce methods */
-
-    public async statusesByCategory(categoryId: number) {
-        const uri = this.getUri({ pathname: '/status' });
-
-        const res = await this.doRequest<JiraIssueStatus[]>(this.getRequestHeaders(uri));
-        return res.filter(({ statusCategory }) => statusCategory.id === categoryId);
-    }
+    /** end overriding private instance methods */
 
     public checkStatusIsFinished(status: JiraIssueStatus) {
         return (
@@ -222,5 +215,3 @@ export const searchIssue = async (params: { value: string; limit: number }): Pro
         ...val.fields,
     })) as Array<JiraIssue>;
 };
-
-jiraService.listStatus;
diff --git a/trpc/router/index.ts b/trpc/router/index.ts
index faa07cc28..a127b6ef4 100644
--- a/trpc/router/index.ts
+++ b/trpc/router/index.ts
@@ -16,7 +16,7 @@ import { crew } from './crew';
 import { appConfig } from './appConfig';
 import { project as projectV2 } from './projectV2';
 import { goal as goalV2 } from './goalV2';
-import { external } from './external';
+import { jira } from './jira';
 
 export const trpcRouter = router({
     filter,
@@ -37,7 +37,7 @@ export const trpcRouter = router({
         project: projectV2,
         goal: goalV2,
     }),
-    external,
+    jira,
 });
 
 export type TrpcRouter = typeof trpcRouter;
diff --git a/trpc/router/external.ts b/trpc/router/jira.ts
similarity index 98%
rename from trpc/router/external.ts
rename to trpc/router/jira.ts
index c0c7c3a5d..89472e9a8 100644
--- a/trpc/router/external.ts
+++ b/trpc/router/jira.ts
@@ -29,7 +29,7 @@ const jiraIssueToExternalTask = (
     };
 };
 
-export const external = router({
+export const jira = router({
     search: protectedProcedure
         .input(
             z.object({