diff --git a/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/resources/GHN.xq b/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/resources/GHN.xq
index 6122539..5e6e97e 100644
--- a/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/resources/GHN.xq
+++ b/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/resources/GHN.xq
@@ -1,6 +1,6 @@
 for $profiles in collection('/db/Profiles/GHN')//Resource
-let $gcf-version := $profiles//Resource/Profile/GHNDescription/RunTimeEnv/Variable[Key/text() = 'gCF-version']/Value/text()
-let $ghn-version := $profiles//Resource/Profile/GHNDescription/RunTimeEnv/Variable[Key/text() = 'GHN-distribution-version']/Value/text()
+let $gcf-version := $profiles//Resource/Profile/GHNDescription/RunTimeEnv/Variable[Key/text() = 'gCF-version']/Value/text() | $profiles//Resource/Profile/GHNDescription/RunTimeEnv/Variable[Key/text() = 'SmartGears']/Value/text()
+let $ghn-version := $profiles//Resource/Profile/GHNDescription/RunTimeEnv/Variable[Key/text() = 'GHN-distribution-version']/Value/text()  | $profiles//Resource/Profile/GHNDescription/RunTimeEnv/Variable[Key/text() = 'SmartGearsDistributionBundle']/Value/text()
 let $scopes := string-join( $profiles/Scopes//Scope/text(), ';')
 let $subtype := $profiles//Resource/Profile/Site/Domain/text()
 <RES_SUBTYPE ISdefault =''/> 
diff --git a/src/main/java/org/gcube/resourcemanagement/support/shared/types/datamodel/ResourceDetailModel.java b/src/main/java/org/gcube/resourcemanagement/support/shared/types/datamodel/ResourceDetailModel.java
index 6e36373..811ac35 100644
--- a/src/main/java/org/gcube/resourcemanagement/support/shared/types/datamodel/ResourceDetailModel.java
+++ b/src/main/java/org/gcube/resourcemanagement/support/shared/types/datamodel/ResourceDetailModel.java
@@ -89,11 +89,11 @@ public class ResourceDetailModel {
 		modelColumns.add(status);
 		
 		modelColumns.add(new ColumnConfig("LastUpdate", "Last Updated", 130));
-		modelColumns.add(new ColumnConfig("gCoreVersion", "gCore v.", 50));
-		modelColumns.add(new ColumnConfig("ghnVersion", "ghn v.", 40));
+		modelColumns.add(new ColumnConfig("gCoreVersion", "Version", 50));
+		modelColumns.add(new ColumnConfig("ghnVersion", "Distro v.", 50));
 
 		
-		ColumnConfig ramLeft = new ColumnConfig("VirtualAvailable", "V. Mem left", 70);
+		ColumnConfig ramLeft = new ColumnConfig("VirtualAvailable", "Mem avail.", 70);
 		ramLeft.setAlignment(HorizontalAlignment.RIGHT);
 		ramLeft.setEditor(new CellEditor(new NumberField()));   
 		final NumberFormat number = NumberFormat.getFormat("#,##0;(#,##0)");