diff --git a/package-lock.json b/package-lock.json
index a147366b84..3927d83f62 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,7 +22,7 @@
         "@gravity-ui/react-data-table": "^2.1.1",
         "@gravity-ui/table": "^1.7.0",
         "@gravity-ui/uikit": "^6.33.0",
-        "@gravity-ui/websql-autocomplete": "^12.7.0",
+        "@gravity-ui/websql-autocomplete": "^13.1.0",
         "@hookform/resolvers": "^3.9.0",
         "@reduxjs/toolkit": "^2.2.3",
         "@tanstack/react-table": "^8.19.3",
@@ -4085,9 +4085,9 @@
       }
     },
     "node_modules/@gravity-ui/websql-autocomplete": {
-      "version": "12.7.0",
-      "resolved": "https://registry.npmjs.org/@gravity-ui/websql-autocomplete/-/websql-autocomplete-12.7.0.tgz",
-      "integrity": "sha512-GirtFkhutu1RBZdLyjgfr9EVtZKu8Uaz6WE3jl6MBgZx/fZtvHmuzOPNeKijgzfzJT1m6fjgeoja+W6jaIcgJQ==",
+      "version": "13.1.0",
+      "resolved": "https://registry.npmjs.org/@gravity-ui/websql-autocomplete/-/websql-autocomplete-13.1.0.tgz",
+      "integrity": "sha512-Iy6xRcCcUERt1yd7fDzw3/s2LbcRxvpf+F38FwgWlHNogEP7iHwlXIeTYjsafcbkkEs3n3ah5sogCvaLN8MCzA==",
       "dependencies": {
         "antlr4-c3": "^3.4.1",
         "antlr4ng": "^3.0.4",
diff --git a/package.json b/package.json
index 8577d71392..01d0c18eaa 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "@gravity-ui/react-data-table": "^2.1.1",
     "@gravity-ui/table": "^1.7.0",
     "@gravity-ui/uikit": "^6.33.0",
-    "@gravity-ui/websql-autocomplete": "^12.7.0",
+    "@gravity-ui/websql-autocomplete": "^13.1.0",
     "@hookform/resolvers": "^3.9.0",
     "@reduxjs/toolkit": "^2.2.3",
     "@tanstack/react-table": "^8.19.3",
diff --git a/src/utils/monaco/yql/generateSuggestions.ts b/src/utils/monaco/yql/generateSuggestions.ts
index c1188022ea..4f06df1256 100644
--- a/src/utils/monaco/yql/generateSuggestions.ts
+++ b/src/utils/monaco/yql/generateSuggestions.ts
@@ -1,6 +1,7 @@
 import type {
     ColumnAliasSuggestion,
     KeywordSuggestion,
+    VariableSuggestion,
 } from '@gravity-ui/websql-autocomplete/shared';
 import type {YQLEntity, YqlAutocompleteResult} from '@gravity-ui/websql-autocomplete/yql';
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
@@ -107,6 +108,10 @@ function removeBackticks(value: string) {
     return value.slice(sliceStart, sliceEnd);
 }
 
+function isVariable(value: string) {
+    return value.startsWith('$');
+}
+
 function removeStartSlash(value: string) {
     if (value.startsWith('/')) {
         return value.slice(1);
@@ -199,7 +204,8 @@ function getColumnDetails(col: AutocompleteColumn) {
 
 export async function generateColumnsSuggestion(
     rangeToInsertSuggestion: monaco.IRange,
-    suggestColumns: YqlAutocompleteResult['suggestColumns'] | undefined,
+    suggestColumns: YqlAutocompleteResult['suggestColumns'],
+    suggestVariables: YqlAutocompleteResult['suggestVariables'],
     database: string,
 ): Promise<monaco.languages.CompletionItem[]> {
     if (!suggestColumns?.tables) {
@@ -209,27 +215,67 @@ export async function generateColumnsSuggestion(
     const normalizedColumns = suggestColumns.all ? ([] as string[]) : undefined;
     const multi = suggestColumns.tables.length > 1;
 
-    const normalizedTableNames =
+    const normalizedSuggestions =
         suggestColumns.tables?.map((entity) => {
             let normalizedEntityName = removeBackticks(entity.name);
-            if (!normalizedEntityName.endsWith('/')) {
+            if (!normalizedEntityName.endsWith('/') && !isVariable(normalizedEntityName)) {
                 normalizedEntityName = `${normalizedEntityName}/`;
             }
-            return normalizeEntityPrefix(normalizedEntityName, database);
+            return {...entity, name: normalizeEntityPrefix(normalizedEntityName, database)};
         }) ?? [];
 
+    const normalizedTableNames = normalizedSuggestions.map((entity) => entity.name);
+
     // remove duplicates if any
     const filteredTableNames = Array.from(new Set(normalizedTableNames));
 
-    const autocompleteResponse = await window.api.viewer.autocomplete({
-        database,
-        table: filteredTableNames,
-        limit: 1000,
-    });
-    if (!autocompleteResponse.Success) {
-        return [];
+    const tableSources = filteredTableNames.filter((name) => !isVariable(name));
+
+    let autocompleteEntities: TAutocompleteEntity[] = [];
+    if (tableSources.length) {
+        const autocompleteResponse = await window.api.viewer.autocomplete({
+            database,
+            table: tableSources,
+            limit: 1000,
+        });
+        if (autocompleteResponse.Success) {
+            autocompleteEntities = autocompleteResponse.Result.Entities ?? [];
+        }
+    }
+
+    const variableSources = filteredTableNames.filter(isVariable);
+    const columnsFromVariable: TAutocompleteEntity[] = [];
+    if (variableSources.length) {
+        variableSources.forEach((source) => {
+            const newColumns =
+                suggestVariables
+                    // Variable name from suggestions doesn't include $ sign
+                    ?.find((variable) => source.slice(1) === variable.name)
+                    ?.value?.columns?.map((col) => ({
+                        Name: col,
+                        Type: 'column' as const,
+                        Parent: source,
+                    })) ?? [];
+            columnsFromVariable.push(...newColumns);
+        });
     }
 
+    const predefinedColumns: TAutocompleteEntity[] = normalizedSuggestions.reduce<
+        TAutocompleteEntity[]
+    >((acc, entity) => {
+        const columns = entity.columns;
+        if (columns) {
+            acc.push(
+                ...columns.map((col) => ({
+                    Name: col,
+                    Type: 'column' as const,
+                    Parent: entity.name,
+                })),
+            );
+        }
+        return acc;
+    }, []);
+
     const tableNameToAliasMap = suggestColumns.tables?.reduce(
         (acc, entity) => {
             const normalizedEntityName = normalizeEntityPrefix(
@@ -246,7 +292,7 @@ export async function generateColumnsSuggestion(
         {} as Record<string, string[]>,
     );
 
-    autocompleteResponse.Result.Entities?.forEach((col) => {
+    [...autocompleteEntities, ...columnsFromVariable, ...predefinedColumns].forEach((col) => {
         if (!isAutocompleteColumn(col)) {
             return;
         }
@@ -293,7 +339,7 @@ export async function generateColumnsSuggestion(
             normalizedColumns?.push(columnNameSuggestion);
         }
     });
-    if (normalizedColumns && normalizedColumns.length > 0) {
+    if (normalizedColumns && normalizedColumns.length > 1) {
         const allColumns = normalizedColumns.join(', ');
         suggestions.push({
             label: allColumns,
@@ -341,13 +387,13 @@ export function generateKeywordsSuggestion(
 
 export function generateVariableSuggestion(
     rangeToInsertSuggestion: monaco.IRange,
-    suggestVariables?: string[],
+    suggestVariables?: VariableSuggestion[],
 ) {
     if (!suggestVariables) {
         return [];
     }
-    return suggestVariables.map((rawVariable) => {
-        const variable = '$' + rawVariable;
+    return suggestVariables.map(({name}) => {
+        const variable = '$' + name;
         return {
             label: variable,
             insertText: variable,
diff --git a/src/utils/monaco/yql/yqlSuggestions.ts b/src/utils/monaco/yql/yqlSuggestions.ts
index 0091a86138..b34d523db3 100644
--- a/src/utils/monaco/yql/yqlSuggestions.ts
+++ b/src/utils/monaco/yql/yqlSuggestions.ts
@@ -128,6 +128,7 @@ async function getSuggestions(
     const columnsSuggestions = await generateColumnsSuggestion(
         rangeToInsertSuggestion,
         parseResult.suggestColumns,
+        parseResult.suggestVariables,
         database,
     );