diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXRegistrySelectionCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXRegistrySelectionCard.java
index ddab869..1713ec4 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXRegistrySelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXRegistrySelectionCard.java
@@ -186,7 +186,7 @@ public class SDMXRegistrySelectionCard extends WizardCard {
 	   
 	    getWizardWindow().setPreviousButtonCommand(sayPreviousCard);
 	    
-	    setEnableBackButton(true);
+	    setEnableBackButton(false);
 		setEnableNextButton(true);
 		
 	}
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXTableDetailCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXTableDetailCard.java
index 6a4b134..6075622 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXTableDetailCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXTableDetailCard.java
@@ -4,6 +4,7 @@
 package org.gcube.portlets.user.td.sdmxexportwidget.client;
 
 import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXExportSession;
+import org.gcube.portlets.user.td.gwtservice.shared.source.SDMXRegistrySource;
 import org.gcube.portlets.user.td.wizardwidget.client.WizardCard;
 
 import com.allen_sauer.gwt.log.client.Log;
@@ -93,7 +94,7 @@ public class SDMXTableDetailCard extends WizardCard {
 		registryBaseUrl = new TextField();
 		registryBaseUrl.setVisible(true);
 		registryBaseUrl.setEmptyText("Enter Registry URL...");
-		registryBaseUrl.setValue(exportSession.getAgency().getName());
+		registryBaseUrl.setValue(((SDMXRegistrySource)exportSession.getSource()).getUrl());
 		FieldLabel registryBaseUrlLabel = new FieldLabel(registryBaseUrl, "Registry URL");
 		registryBaseUrlLabel.setLabelSeparator("");
 		p.add(registryBaseUrlLabel, new VerticalLayoutData(1, -1));
@@ -101,7 +102,7 @@ public class SDMXTableDetailCard extends WizardCard {
 		version = new TextField();
 		version.setAllowBlank(false);
 		version.setEmptyText("Enter Version...");
-		version.setValue(exportSession.getTabResource().getName());
+		version.setValue("");
 		p.add(new FieldLabel(version, "Version"), new VerticalLayoutData(1, -1));