diff --git a/js/app/controllers/EpnTapModule.js b/js/app/controllers/EpnTapModule.js
index 61bf071..76d80c5 100644
--- a/js/app/controllers/EpnTapModule.js
+++ b/js/app/controllers/EpnTapModule.js
@@ -52,8 +52,6 @@ Ext.define('amdaDesktop.EpnTapModule', {
 		this.granulesStore.removeAll();
 
 		if(target) {
-			var name = target[0].charAt(0).toUpperCase() + target[0].replace(/_/g, ' ').substr(1).toLowerCase();
-			this.targetNameCB.getStore().add({'id': target[0], 'name': name});
 			this.targetNameCB.select(target[0]);
 			this.productTypeCB.select(target[1]);
 			this.getServices();
diff --git a/js/app/controllers/InteropModule.js b/js/app/controllers/InteropModule.js
index 518d03f..f473e7d 100644
--- a/js/app/controllers/InteropModule.js
+++ b/js/app/controllers/InteropModule.js
@@ -62,16 +62,17 @@ Ext.define('amdaDesktop.InteropModule', {
 		if(!this.epntap) {
 			this.epntap = Ext.create('amdaDesktop.EpnTapModule');
 		}
+		// [Target name, product type]
 		var icons_dic = {
-			'icon-mercury': ['mercury', 'ts'],
-			'icon-venus': ['venus', 'ts'],
-			'icon-earth': ['earth', 'ts'],
-			'icon-mars': ['mars', 'ts'],
-			'icon-jupiter': ['jupiter', 'ts'],
-			'icon-saturn': ['saturn', 'ts'],
-			'icon-comet': ['comet', 'ts'],
-			'icon-sw': ['all', 'ts'],
-			'icon-solarsystem': ['all', 'ts']
+			'icon-mercury': ['Mercury', 'all'],
+			'icon-venus': ['Venus', 'all'],
+			'icon-earth': ['Earth', 'all'],
+			'icon-mars': ['Mars', 'all'],
+			'icon-jupiter': ['Jupiter', 'all'],
+			'icon-saturn': ['Saturn', 'all'],
+			'icon-comet': ['Comet', 'all'],
+			'icon-sw': ['', 'all'],
+			'icon-solarsystem': ['', 'all']
 		}
 		this.epntap.loadTarget(icon_id ? icons_dic[icon_id]: false);
 	},
diff --git a/js/app/views/EpnTapUI.js b/js/app/views/EpnTapUI.js
index 2828240..d5b128e 100644
--- a/js/app/views/EpnTapUI.js
+++ b/js/app/views/EpnTapUI.js
@@ -470,7 +470,7 @@ Ext.define('amdaUI.EpnTapUI', {
 				}
 			},
 			listeners: {
-				select: function(cb, records) {
+				change: function(cb, records) {
 					var val = cb.value[cb.value.length - 1];
 					if(val === 'all') {
 						cb.select(cb.store.getRange().slice(2));
--
libgit2 0.21.2