diff --git a/src/main/java/org/gcube/common/storagehubwrapper/server/WorkspaceStorageHubClientService.java b/src/main/java/org/gcube/common/storagehubwrapper/server/WorkspaceStorageHubClientService.java
index 60c1ba1..7fdd6cf 100644
--- a/src/main/java/org/gcube/common/storagehubwrapper/server/WorkspaceStorageHubClientService.java
+++ b/src/main/java/org/gcube/common/storagehubwrapper/server/WorkspaceStorageHubClientService.java
@@ -322,7 +322,7 @@ public final class WorkspaceStorageHubClientService implements Workspace{
 			return (WorkspaceFolder) HLMapper.toWorkspaceItem(item);
 		}
 		catch (Exception e) {
-			logger.error("Error on creting the folde: ",e);
+			logger.error("Error on creating the folder: ",e);
 			throw new InternalErrorException(e.getMessage());
 		}
 
diff --git a/src/main/java/org/gcube/common/storagehubwrapper/server/converter/HLMapper.java b/src/main/java/org/gcube/common/storagehubwrapper/server/converter/HLMapper.java
index 66c4c2d..75ea508 100644
--- a/src/main/java/org/gcube/common/storagehubwrapper/server/converter/HLMapper.java
+++ b/src/main/java/org/gcube/common/storagehubwrapper/server/converter/HLMapper.java
@@ -242,6 +242,9 @@ public class HLMapper {
 			theTrashItem.setLenght(trashItem.getLenght());
 			theTrashItem.setMimeType(trashItem.getMimeType());
 			isFolder = trashItem.getFolder(); //DO NOT MOVE THIS SET
+			if(isFolder)
+				type = WorkspaceItemType.TRASH_FOLDER;
+
 			logger.trace("Wrapped TrashItem: "+theTrashItem);
 		}
 
diff --git a/src/main/java/org/gcube/common/storagehubwrapper/shared/tohl/WorkspaceItemType.java b/src/main/java/org/gcube/common/storagehubwrapper/shared/tohl/WorkspaceItemType.java
index 9cee96b..1e45470 100644
--- a/src/main/java/org/gcube/common/storagehubwrapper/shared/tohl/WorkspaceItemType.java
+++ b/src/main/java/org/gcube/common/storagehubwrapper/shared/tohl/WorkspaceItemType.java
@@ -1,48 +1,42 @@
 /**
  *
  */
+
 package org.gcube.common.storagehubwrapper.shared.tohl;
 
-
-
 /**
  * The Enum WorkspaceItemType.
  *
  * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
- * Jun 19, 2018
+ *         Jun 19, 2018
  */
 public enum WorkspaceItemType {
-
 	/**
 	 * A folder.
 	 */
 	FOLDER,
-
 	/**
 	 * A shared folder
 	 */
 	SHARED_FOLDER,
-
 	/**
 	 * A smart folder
 	 */
 	SMART_FOLDER,
-
+	/**
+	 * The vre folder.
+	 */
+	VRE_FOLDER,
 	/**
 	 * A folder item.
 	 */
 	FILE_ITEM,
-
 	/**
 	 * A trash folder.
 	 */
 	TRASH_FOLDER,
-
 	/**
 	 * A trash item.
 	 */
-	TRASH_ITEM,
-
-	VRE_FOLDER;
-
-}
\ No newline at end of file
+	TRASH_ITEM
+}
diff --git a/src/main/java/org/gcube/common/storagehubwrapper/shared/tohl/impl/TrashItem.java b/src/main/java/org/gcube/common/storagehubwrapper/shared/tohl/impl/TrashItem.java
index 7717946..42a6c9c 100644
--- a/src/main/java/org/gcube/common/storagehubwrapper/shared/tohl/impl/TrashItem.java
+++ b/src/main/java/org/gcube/common/storagehubwrapper/shared/tohl/impl/TrashItem.java
@@ -34,5 +34,6 @@ public class TrashItem extends WorkspaceItem implements TrashedItem{
 	Calendar deletedTime;
 	String mimeType;
 	long lenght;
+	//DO NOT ADD isFolder. The field is implemnted in the WorkspaceItem
 
 }
diff --git a/src/main/java/org/gcube/common/storagehubwrapper/shared/tohl/impl/WorkspaceSharedFolder.java b/src/main/java/org/gcube/common/storagehubwrapper/shared/tohl/impl/WorkspaceSharedFolder.java
index 03cc395..e26811a 100644
--- a/src/main/java/org/gcube/common/storagehubwrapper/shared/tohl/impl/WorkspaceSharedFolder.java
+++ b/src/main/java/org/gcube/common/storagehubwrapper/shared/tohl/impl/WorkspaceSharedFolder.java
@@ -9,19 +9,12 @@ import lombok.Setter;
 import lombok.ToString;
 
 
-/**
- * The Class WorkspaceFolderImpl.
- *
- * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
- * Jun 15, 2018
- */
-@Getter
-
 /**
  * Instantiates a new workspace folder impl.
  */
 @NoArgsConstructor
 @Setter
+@Getter
 @ToString(callSuper=true)
 public class WorkspaceSharedFolder extends WorkspaceFolder implements org.gcube.common.storagehubwrapper.shared.tohl.WorkspaceSharedFolder{
 
diff --git a/src/main/java/org/gcube/common/storagehubwrapper/shared/tohl/items/FileItemType.java b/src/main/java/org/gcube/common/storagehubwrapper/shared/tohl/items/FileItemType.java
index 7e2a2b8..4e8468c 100644
--- a/src/main/java/org/gcube/common/storagehubwrapper/shared/tohl/items/FileItemType.java
+++ b/src/main/java/org/gcube/common/storagehubwrapper/shared/tohl/items/FileItemType.java
@@ -1,52 +1,40 @@
 /**
  *
  */
+
 package org.gcube.common.storagehubwrapper.shared.tohl.items;
 
 import org.gcube.common.storagehub.model.types.GenericItemType;
 
-
 /**
  * The Enum FileItemType.
  *
  * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
- * Jun 21, 2018
+ *         Jun 21, 2018
  */
-public enum FileItemType implements GenericItemType{
-
+public enum FileItemType implements GenericItemType {
 	/**
 	 * Document.
 	 */
 	DOCUMENT,
-
 	/**
 	 * Image document.
 	 */
 	IMAGE_DOCUMENT,
-
 	/**
 	 * PDF document.
 	 */
 	PDF_DOCUMENT,
-
 	/**
 	 * Url document.
 	 */
 	URL_DOCUMENT,
-
 	/**
 	 * Metadata.
 	 */
 	METADATA,
-
-	/**
-	 * Trash item
-	 */
-	TRASH_ITEM,
-
 	/**
 	 * A gCube item.
 	 */
 	GCUBE_ITEM
-
-}
\ No newline at end of file
+}