diff --git a/BUILD b/BUILD
index 21f55b6..02323f2 100644
--- a/BUILD
+++ b/BUILD
@@ -1 +1 @@
-20240430-1150
\ No newline at end of file
+20240514-1518
\ No newline at end of file
diff --git a/JAVA/src/main/java/it/bancaditalia/oss/sdmx/helper/ToolCommandsFrame.java b/JAVA/src/main/java/it/bancaditalia/oss/sdmx/helper/ToolCommandsFrame.java
index 3735ed6..2c1a41d 100644
--- a/JAVA/src/main/java/it/bancaditalia/oss/sdmx/helper/ToolCommandsFrame.java
+++ b/JAVA/src/main/java/it/bancaditalia/oss/sdmx/helper/ToolCommandsFrame.java
@@ -106,7 +106,7 @@ public ToolCommandsFrame(String dataflow, String queryString, String provider) t
 		panel.add(rCommandLabel, gbc_rCommandLabel);
 		
 		if(SDMXVersion.V2 == SDMXClientFactory.getProviders().get(provider).getSdmxVersion())
-			rCommandText = new JTextField("result <- getTimeSeries(provider='" + provider + "', id='" + queryString + "');");
+			rCommandText = new JTextField("result <- getTimeSeries(provider='" + provider + "', id='" + dataflow + "/" + queryString + "');");
 		else
 			rCommandText = new JTextField("result <- getTimeSeries2(provider='" + provider + "', dataflow='" + dataflow + "', filter='" + queryString + "');");
 		rCommandLabel.setLabelFor(rCommandText);
@@ -129,7 +129,7 @@ public ToolCommandsFrame(String dataflow, String queryString, String provider) t
 		panel.add(matlabCommandLabel, gbc_matlabCommandLabel);
 		
 		if(SDMXVersion.V2 == SDMXClientFactory.getProviders().get(provider).getSdmxVersion())
-			matlabCommandText = new JTextField("result = getTimeSeries('" + provider + "', '" + queryString + "');");
+			matlabCommandText = new JTextField("result = getTimeSeries('" + provider + "', '" + dataflow + "/" + queryString + "');");
 		else
 			matlabCommandText = new JTextField("result = getTimeSeriesTable2('" + provider + "', '" + dataflow + "', '', '" + queryString + "');");
 		matlabCommandLabel.setLabelFor(matlabCommandText);
@@ -152,7 +152,7 @@ public ToolCommandsFrame(String dataflow, String queryString, String provider) t
 		panel.add(sasCommandLabel, gbc_sasCommandLabel);
 		
 		if(SDMXVersion.V2 == SDMXClientFactory.getProviders().get(provider).getSdmxVersion())
-			sasCommandText = new JTextField("%gettimeseries(provider=\"" + provider + "\", tsKey=\"" + queryString + "\", metadata=1);");
+			sasCommandText = new JTextField("%gettimeseries(provider=\"" + provider + "\", tsKey=\"" + dataflow + "/" + queryString + "\", metadata=1);");
 		else
 			sasCommandText = new JTextField("NOT AVAILABLE");
 		sasCommandLabel.setLabelFor(sasCommandText);
@@ -175,7 +175,7 @@ public ToolCommandsFrame(String dataflow, String queryString, String provider) t
 		panel.add(stataCommandLabel, gbc_stataCommandLabel);
 		
 		if(SDMXVersion.V2 == SDMXClientFactory.getProviders().get(provider).getSdmxVersion())
-			stataCommandText = new JTextField("getTimeSeries " + provider + " " + queryString + " \"\" \"\" 0 0");
+			stataCommandText = new JTextField("getTimeSeries " + provider + " " + dataflow + "/" + queryString + " \"\" \"\" 0 0");
 		else
 			stataCommandText = new JTextField("NOT AVAILABLE");
 		stataCommandLabel.setLabelFor(stataCommandText);
diff --git a/RJSDMX/inst/java/SDMX.jar b/RJSDMX/inst/java/SDMX.jar
index 1693ae2..d8197d6 100644
Binary files a/RJSDMX/inst/java/SDMX.jar and b/RJSDMX/inst/java/SDMX.jar differ
diff --git a/STATA/jar/SDMX.jar b/STATA/jar/SDMX.jar
index 8bf067e..8082dd1 100644
Binary files a/STATA/jar/SDMX.jar and b/STATA/jar/SDMX.jar differ