diff --git a/rsc_clone.sh b/rsc_clone.sh
index b81e5de..515067b 100755
--- a/rsc_clone.sh
+++ b/rsc_clone.sh
@@ -258,13 +258,13 @@ oracleDatabases(filter: $filter) {
     gqlVars="$(echo $variables)"
     rsc_gql_query
 
-    dbid=$(cat /tmp/rbkresponse.$$ | jq -r --arg NODE "$node_name" '.data.oracleDatabases.nodes[] | select(.logicalPath[]?.name == $NODE) | .id')
-    cdmId=$(cat /tmp/rbkresponse.$$ | jq -r --arg NODE "$node_name" '.data.oracleDatabases.nodes[] | select(.logicalPath[]?.name == $NODE) | .cluster.id')
+    dbid=$(cat /tmp/rbkresponse.$$ | jq -r --arg NODE "$node_name" '.data.oracleDatabases.nodes[] | select(.logicalPath[]?.name | test("^" + $NODE + "(\\.|$)")) | .id')
+    cdmId=$(cat /tmp/rbkresponse.$$ | jq -r --arg NODE "$node_name" '.data.oracleDatabases.nodes[] | select(.logicalPath[]?.name | test("^" + $NODE + "(\\.|$)")) | .cluster.id')
 
     dbid_count=$(echo "$dbid" | grep -c .)
     if [[ "$dbid_count" -ne 1 || -z "$dbid" ]]; then
         echo "ERROR: Expected exactly one database running on node '$node_name', found $dbid_count:"
-        cat /tmp/rbkresponse.$$ | jq -r '.data.oracleDatabases.nodes[] | "\(.dbUniqueName) \(.id)"'
+        cat /tmp/rbkresponse.$$ | jq -r '.data.oracleDatabases.nodes[] | "\(.dbUniqueName) \(.logicalPath[0].name) \(.id)"'
         cleanup
         exit 4
     fi