diff --git a/distro/changelog.xml b/distro/changelog.xml
index d55ed01..2a4fd12 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,12 @@
 <ReleaseNotes>
+	<Changeset
+		component="org.gcube.portlets-user.workspace-portlet-tree.6-28-0"
+		date="${buildDate}">
+		<Change>Merged with branch version
+		</Change>
+		<Change>Changed shared folder check to send notification 
+		</Change>
+	</Changeset>
 	<Changeset
 		component="org.gcube.portlets-user.workspace-portlet-tree.6-27-0"
 		date="${buildDate}">
diff --git a/pom.xml b/pom.xml
index dc0440d..24bcb82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>workspace-tree-widget</artifactId>
-	<version>6.27.0-SNAPSHOT</version>
+	<version>6.28.0-SNAPSHOT</version>
 	<name>gCube Workspace Tree Widget</name>
 	<description>
 		gCube Workspace Tree Widget is a widget to navigate and interact with gCube Workspace 
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/model/FileModel.java b/src/main/java/org/gcube/portlets/user/workspace/client/model/FileModel.java
index 9d5dbc8..a4ad6c4 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/model/FileModel.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/model/FileModel.java
@@ -11,6 +11,7 @@ import org.gcube.portlets.user.workspace.client.resources.Resources;
 import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel;
 
 import com.extjs.gxt.ui.client.data.BaseModelData;
+import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.IsSerializable;
 import com.google.gwt.user.client.ui.AbstractImagePrototype;
 import com.google.gwt.user.client.ui.Image;
@@ -295,7 +296,7 @@ public class FileModel extends BaseModelData implements Serializable, IsSerializ
 	 */
 	public AbstractImagePrototype getAbstractPrototypeIcon() {
 
-		//GWT.log("My prop: "+this.toString());
+		GWT.log("My prop: "+this.toString());
 
 		AbstractImagePrototype absImgPr = Resources.getIconTable();
 
@@ -321,7 +322,7 @@ public class FileModel extends BaseModelData implements Serializable, IsSerializ
 					if(this.isPublic()) //IS PLUBIC
 						absImgPr = Resources.getIconFolderPublic();
 					else
-						absImgPr = Resources.getIconFolder(); //IS A PRIVATE FOLDER
+						absImgPr = Resources.getIconSharedFolder(); //IS A SHARED FOLDER DESCENDANT OF ROOT SHARED FOLDER
 				}
 			}
 
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/AsyncTreePanel.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/AsyncTreePanel.java
index 1cdc219..7c9ce37 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/AsyncTreePanel.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/AsyncTreePanel.java
@@ -209,7 +209,7 @@ public class AsyncTreePanel extends LayoutContainer {
 						if(model.isPublic()) //IS PLUBIC
 							return  Resources.getIconFolderPublic();
 						else
-							return Resources.getIconFolder();
+							return Resources.getIconSharedFolder(); //IS CHILDREN OF ROOT SHARED FOLDER
 					}
 
 				}
@@ -347,42 +347,6 @@ public class AsyncTreePanel extends LayoutContainer {
 				loadRootInStore(result, selectRoot);
 			}
 		});
-
-
-//		if(this.scopeId !=null){
-//			//Load Root with specific scope id
-//			AppControllerExplorer.rpcWorkspaceService.getRootForTree(scopeId, new AsyncCallback<FolderModel>() {
-//
-//				@Override
-//				public void onFailure(Throwable caught) {
-//					new MessageBoxAlert("Error", ConstantsExplorer.SERVER_ERROR + " getting root item. " +ConstantsExplorer.TRY_AGAIN, null);
-//
-//				}
-//
-//				@Override
-//				public void onSuccess(FolderModel result) {
-//					loadRootInStore(result, selectRoot);
-//
-//				}
-//			});
-//		}
-//
-//		else{
-//			//Load Root without filtering on scope id
-//			AppControllerExplorer.rpcWorkspaceService.getRootForTree(new AsyncCallback<FolderModel>() {
-//
-//				@Override
-//				public void onFailure(Throwable caught) {
-//					new MessageBoxAlert("Error", ConstantsExplorer.SERVER_ERROR + " getting root item. " +ConstantsExplorer.TRY_AGAIN, null);
-//
-//				}
-//
-//				@Override
-//				public void onSuccess(FolderModel result) {
-//					loadRootInStore(result, selectRoot);
-//				}
-//			});
-//		}
 	}
 
 
diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/ObjectStorageHubToWorkpaceMapper.java b/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/ObjectStorageHubToWorkpaceMapper.java
index 9e01357..02c1908 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/ObjectStorageHubToWorkpaceMapper.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/ObjectStorageHubToWorkpaceMapper.java
@@ -132,7 +132,8 @@ public class ObjectStorageHubToWorkpaceMapper {
 			break;
 
 		default:
-			logger.error("ALERT Conversion RETURNING null for item "+wrappedItem.getName());
+			logger.warn("Default conversion to base item for item: "+wrappedItem);
+			fileModel = new FileModel(wrappedItem.getId(), wrappedItem.getName(), parentFolderModel, wrappedItem.isFolder(), wrappedItem.isShared());
 			break;
 
 		}
@@ -238,7 +239,8 @@ public class ObjectStorageHubToWorkpaceMapper {
 			break;
 
 		default:
-			logger.error("gxt conversion return null for item "+wrappedItem.getName());
+			logger.warn("Default conversion to base item for item: "+wrappedItem);
+			fileGridModel = new FileGridModel(wrappedItem.getId(), wrappedItem.getName(),  FormatterUtil.toDate(wrappedItem.getLastModificationTime()), parentFolderModel, -1, wrappedItem.isFolder(), wrappedItem.isShared());
 			break;
 
 		}