diff --git a/redisinsight/ui/src/pages/vector-search/saved-queries/SavedQueriesScreen.tsx b/redisinsight/ui/src/pages/vector-search/saved-queries/SavedQueriesScreen.tsx
index 70efdeb292..dc92c25425 100644
--- a/redisinsight/ui/src/pages/vector-search/saved-queries/SavedQueriesScreen.tsx
+++ b/redisinsight/ui/src/pages/vector-search/saved-queries/SavedQueriesScreen.tsx
@@ -28,12 +28,22 @@ import { savedQueries } from './saved-queries'
 const mockSavedIndexes: SavedIndex[] = [
   {
     value: PresetDataType.BIKES,
-    tags: [FieldTypes.TAG, FieldTypes.TEXT, FieldTypes.VECTOR],
+    tags: [
+      FieldTypes.NUMERIC,
+      FieldTypes.TAG,
+      FieldTypes.TEXT,
+      FieldTypes.VECTOR,
+    ],
     queries: savedQueries[PresetDataType.BIKES],
   },
   {
     value: PresetDataType.MOVIES,
-    tags: [FieldTypes.TAG, FieldTypes.TEXT, FieldTypes.VECTOR],
+    tags: [
+      FieldTypes.NUMERIC,
+      FieldTypes.TAG,
+      FieldTypes.TEXT,
+      FieldTypes.VECTOR,
+    ],
     queries: savedQueries[PresetDataType.MOVIES],
   },
 ]
diff --git a/redisinsight/ui/src/utils/index/generateFtCreateCommand.spec.ts b/redisinsight/ui/src/utils/index/generateFtCreateCommand.spec.ts
index 5fe36a1ba2..ca575ec7ce 100644
--- a/redisinsight/ui/src/utils/index/generateFtCreateCommand.spec.ts
+++ b/redisinsight/ui/src/utils/index/generateFtCreateCommand.spec.ts
@@ -32,14 +32,17 @@ describe('generateFtCreateCommand', () => {
       dataContent: SampleDataContent.CONTENT_RECOMMENDATIONS,
     })
 
-    expect(result).toBe(`FT.CREATE idx:movies ON JSON PREFIX 1 "movie:" SCHEMA
-  $.title AS title TEXT
-  $.genres[*] AS genres TAG
-  $.plot AS plot TEXT
-  $.year AS year NUMERIC
-  $.embedding AS embedding VECTOR FLAT 6
-    TYPE FLOAT32
-    DIM 8
-    DISTANCE_METRIC COSINE`)
+    expect(result).toBe(`FT.CREATE idx:movies
+    ON JSON
+      PREFIX 1 "movie:"
+    SCHEMA
+      $.title AS title TEXT
+      $.genres[*] AS genres TAG
+      $.plot AS plot TEXT
+      $.year AS year NUMERIC
+      $.embedding AS embedding VECTOR FLAT 6
+        TYPE FLOAT32
+        DIM 8
+        DISTANCE_METRIC COSINE`)
   })
 })
diff --git a/redisinsight/ui/src/utils/index/generateFtCreateCommand.ts b/redisinsight/ui/src/utils/index/generateFtCreateCommand.ts
index 4cbcd82e2e..895c482e89 100644
--- a/redisinsight/ui/src/utils/index/generateFtCreateCommand.ts
+++ b/redisinsight/ui/src/utils/index/generateFtCreateCommand.ts
@@ -15,15 +15,18 @@ export const generateFtCreateCommand = ({
   dataContent,
 }: FtCreateCommandParams): string => {
   if (dataContent === SampleDataContent.CONTENT_RECOMMENDATIONS) {
-    return `FT.CREATE ${indexName} ON JSON PREFIX 1 "movie:" SCHEMA
-  $.title AS title TEXT
-  $.genres[*] AS genres TAG
-  $.plot AS plot TEXT
-  $.year AS year NUMERIC
-  $.embedding AS embedding VECTOR FLAT 6
-    TYPE FLOAT32
-    DIM 8
-    DISTANCE_METRIC COSINE`
+    return `FT.CREATE ${indexName}
+    ON JSON
+      PREFIX 1 "movie:"
+    SCHEMA
+      $.title AS title TEXT
+      $.genres[*] AS genres TAG
+      $.plot AS plot TEXT
+      $.year AS year NUMERIC
+      $.embedding AS embedding VECTOR FLAT 6
+        TYPE FLOAT32
+        DIM 8
+        DISTANCE_METRIC COSINE`
   }
 
   return `FT.CREATE ${indexName}