diff --git a/redisinsight/ui/src/packages/redisgraph/src/parser.ts b/redisinsight/ui/src/packages/redisgraph/src/parser.ts
index 705d31c76e..2cbb20f9c8 100644
--- a/redisinsight/ui/src/packages/redisgraph/src/parser.ts
+++ b/redisinsight/ui/src/packages/redisgraph/src/parser.ts
@@ -71,7 +71,7 @@ function responseParser(data: any): IResponseParser {
       if (Array.isArray(item)) {
         if (item[0][0] === 'id' && item[1][0] === 'labels') {
           const node: INode = {
-            id: item[0][1].toString(),
+            id: item[0][1],
             labels: item[1][1],
             properties: {}
           }
@@ -81,15 +81,15 @@ function responseParser(data: any): IResponseParser {
             const v = resolveProps(x)
             node['properties'][v.key] = v.value
           })
-          if (nodes.findIndex((e: INode) => e.id === item[0][1].toString()) === -1) {
+          if (nodes.findIndex((e: INode) => e.id === item[0][1]) === -1) {
             nodes.push(node)
           }
         } else if (item[0][0] === 'id' && item[1][0] === 'type') {
           const edge: IEdge = {
-            id: item[0][1].toString(),
+            id: item[0][1],
             type: item[1][1],
-            source: item[2][1].toString(),
-            target: item[3][1].toString(),
+            source: item[2][1],
+            target: item[3][1],
             properties: {}
           }
           types[item[1][1]] = (types[item[1][1]] + 1) || 1
@@ -155,7 +155,7 @@ function ResultsParser(data: any[][]) : {headers: any[], results: any[] }{
       if (Array.isArray(entity)) {
         if (entity[0][0] === 'id') {
           const item: any = {
-            id: entity[0][1].toString(),
+            id: entity[0][1],
             properties: {}
           }
           let propValues = []
@@ -164,8 +164,8 @@ function ResultsParser(data: any[][]) : {headers: any[], results: any[] }{
             propValues = entity[2][1]
           } else if (entity[1][0] === 'type') {
             item.type = entity[1][1]
-            item.source = entity[2][1].toString()
-            item.target = entity[3][1].toString()
+            item.source = entity[2][1]
+            item.target = entity[3][1]
             propValues = entity[4][1]
           }
           propValues.map((x: any) => {
diff --git a/redisinsight/ui/src/packages/redisgraph/src/utils.ts b/redisinsight/ui/src/packages/redisgraph/src/utils.ts
index 67a83abcb5..60b8353737 100644
--- a/redisinsight/ui/src/packages/redisgraph/src/utils.ts
+++ b/redisinsight/ui/src/packages/redisgraph/src/utils.ts
@@ -189,23 +189,23 @@ export function commandIsSuccess(resp: [{ response: any, status: string }]) {
 }
 
 
-export function getFetchNodesByIdQuery(graphKey: string, nodeIds: string[]): string {
+export function getFetchNodesByIdQuery(graphKey: string, nodeIds: number[]): string {
   return `graph.ro_query ${graphKey} "MATCH (n) WHERE id(n) IN [${nodeIds}] RETURN DISTINCT n"`
 }
 
-export function getFetchNodesByEdgeIdQuery(graphKey: string, edgeIds: string[], existingNodeIds: string[]): string {
+export function getFetchNodesByEdgeIdQuery(graphKey: string, edgeIds: number[], existingNodeIds: number[]): string {
   return `graph.ro_query ${graphKey} "MATCH (n)-[t]->(m) WHERE id(t) IN [${edgeIds}] AND NOT id(n) IN [${existingNodeIds}] AND NOT id(m) IN [${existingNodeIds}] RETURN n, m"`
 }
 
-export function getFetchEdgesByIdQuery(graphKey: string, edgeIds: string[]): string {
+export function getFetchEdgesByIdQuery(graphKey: string, edgeIds: number[]): string {
     return `graph.ro_query ${graphKey} "MATCH ()-[t]->() WHERE id(t) IN [${edgeIds}] RETURN DISTINCT t"`
 }
 
-export function getFetchDirectNeighboursOfNodeQuery(graphKey: string, nodeId: string): string {
+export function getFetchDirectNeighboursOfNodeQuery(graphKey: string, nodeId: number): string {
   return `graph.ro_query "${graphKey}" "MATCH (n)-[t]-(m) WHERE id(n)=${nodeId} RETURN t, m"`
 }
 
 
-export function getFetchNodeRelationshipsQuery(graphKey: string, sourceNodeIds: string[], destNodeIds: string[], existingEdgeIds: string[]): string {
+export function getFetchNodeRelationshipsQuery(graphKey: string, sourceNodeIds: number[], destNodeIds: number[], existingEdgeIds: number[]): string {
   return `graph.ro_query ${graphKey} "MATCH (n)-[t]->(m) WHERE (ID(n) IN [${sourceNodeIds}] OR ID(m) IN [${destNodeIds}]) AND NOT ID(t) IN [${existingEdgeIds}] RETURN DISTINCT t"`
 }