diff --git a/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java b/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java
index a72f8e0..33a3331 100644
--- a/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java
@@ -28,7 +28,6 @@ import org.gcube.contentmanagement.blobstorage.service.IClient;
 import org.gcube.contentmanager.storageclient.wrapper.AccessType;
 import org.gcube.contentmanager.storageclient.wrapper.MemoryType;
 import org.gcube.contentmanager.storageclient.wrapper.StorageClient;
-import org.gcube.portal.custom.communitymanager.OrganizationManager;
 import org.gcube.portal.custom.communitymanager.OrganizationsUtil;
 import org.gcube.portal.custom.communitymanager.impl.OrganizationManagerImpl;
 import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper;
diff --git a/src/main/java/org/gcube/portlets/user/shareupdates/server/TextTransfromUtils.java b/src/main/java/org/gcube/portlets/user/shareupdates/server/TextTransfromUtils.java
index 196e82d..78426ab 100644
--- a/src/main/java/org/gcube/portlets/user/shareupdates/server/TextTransfromUtils.java
+++ b/src/main/java/org/gcube/portlets/user/shareupdates/server/TextTransfromUtils.java
@@ -78,10 +78,10 @@ public class TextTransfromUtils {
 	 */
 	protected static List<String> getHashTags(String postText) {
 		List<String> hashtags = new ArrayList<>();		
-		Pattern MY_PATTERN = Pattern.compile("#(\\w+)");
+		Pattern MY_PATTERN = Pattern.compile("^#\\w+|\\s#\\w+");
 		Matcher matcher = MY_PATTERN.matcher(postText);
 		while (matcher.find()) {
-			hashtags.add("#"+matcher.group(1));
+			hashtags.add("#"+matcher.group().replace(" ", "").replace("#", ""));
 		}
 		return hashtags;		
 	}