diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index bf08e59..2e0d87a 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,6 +4,9 @@
     <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
+        <dependent-module archiveName="workspace-light-tree-2.13.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-light-tree/workspace-light-tree">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
         <property name="context-root" value="news-feed"/>
   </wb-module>
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java
index 3185873..282c834 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java
@@ -275,7 +275,15 @@ public class NewsFeedPanel extends Composite {
 						filterPanel.removeFilterSelected();
 					} 
 					else if (getHashtagParam() != null) {
-						String hashtag = Encoder.decode(getHashtagParam());
+						String hashtag = "";
+						try {
+							Encoder.decode(getHashtagParam());
+						} catch (Exception e) {
+							newsPanel.clear();
+							newsPanel.add(new HTML("<div class=\"nofeed-message\"><div style=\"padding-top: 90px;\">" +
+									"We're sorry, it seems you used an invalid character, please check the hashtag</div>"));
+							return;
+						}
 						GWT.log("Found hashtag " + hashtag);
 						showFeedsByHashtag(hashtag);
 						filterPanel.removeFilterSelected();
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java
index 8c4baff..63f30ce 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java
@@ -171,10 +171,7 @@ public class TweetTemplate extends Composite {
 			if (showTimelineSource && feed.getVreid() != null && feed.getVreid().compareTo("") != 0) {
 				String vreName = feed.getVreid().substring(feed.getVreid().lastIndexOf("/")+1);
 				vreSource.setHTML("<a class=\"link\" style=\"font-size: 10px; white-space: nowrap;\" href=\"/group/"+vreName.toLowerCase()+"\">[" +vreName + "]</a>");
-			} else {
-				vreSource.setHTML("[multiple]");
-			}
-				
+			} 
 			//check if the user has his own avatar
 			if (feed.getThumbnailURL().endsWith("img_id=0") || !feed.getThumbnailURL().contains("?")) { //it means no avatar is set
 				avatarImage.setVisible(false);