diff --git a/.classpath b/.classpath
index d1cf11c..b409829 100644
--- a/.classpath
+++ b/.classpath
@@ -6,14 +6,14 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="src/main/webapp/WEB-INF/classes" path="src/main/resources"/>
+	<classpathentry kind="src" output="src/main/webapp/WEB-INF/classes" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index bf02f90..d969bb0 100644
--- a/.settings/com.google.gdt.eclipse.core.prefs
+++ b/.settings/com.google.gdt.eclipse.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
 jarsExcludedFromWebInfLib=
-lastWarOutDir=/Users/massi/Documents/workspace/news-feed/target/news-feed-1.8.2-SNAPSHOT
+lastWarOutDir=/home/costantino/workspace/news-feed_good_trunk/target/news-feed-2.1.0-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 7d33a49..e21c042 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,6 +4,8 @@
     <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"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
     <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 04ec325..49c9c89 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
@@ -119,8 +119,8 @@ public class NewsFeedPanel extends Composite {
 
 	public static final String GET_OID_PARAMETER = "oid";
 
-	public static final String LIKE_LABEL = "Favorite";
-	public static final String LIKED_LABEL = "Favorited";
+	public static final String LIKE_LABEL = "Like";
+	public static final String LIKED_LABEL = "Liked";
 	public static final String COMMENT_LABEL = "Reply";
 	public static final String SHARE_FWD_LABEL =  "Share";
 	private static final int SEARCHED_FEEDS_TO_SHOW = 10;
@@ -353,7 +353,7 @@ public class NewsFeedPanel extends Composite {
 				}
 				//adjustments in the UI Depending on the scope
 				if (result.isInfrastructure()) {
-					filterPanelWrapper.setVisible(getFeedToShowId() == null);
+					//filterPanelWrapper.setVisible(getFeedToShowId() == null);
 					showFeedTimelineSource = result.isShowTimelineSourceLabel();
 					isInfrastructure = true;
 				}
@@ -637,7 +637,7 @@ public class NewsFeedPanel extends Composite {
 
 									GWT.log("Retrieved " + feeds.size() + " hits for search.");
 									if (feeds.size() == 0) { 
-										newsPanel.add(new ResultsFor("Results for ", actionToPrint));
+										newsPanel.add(new ResultsFor("", actionToPrint));
 										newsPanel.add(new HTML("<div class=\"nofeed-message\" style=\"height: 200px;\">" +
 												"Sorry, looks like we found no match for action : " + actionToPrint +"</div>"));
 									}
@@ -645,7 +645,7 @@ public class NewsFeedPanel extends Composite {
 										newsPanel.setHeight("");
 										newsPanel.setHorizontalAlignment(HasAlignment.ALIGN_LEFT);
 										newsPanel.setVerticalAlignment(HasVerticalAlignment.ALIGN_TOP);
-										newsPanel.add(new ResultsFor("Results for ", actionToPrint));
+										newsPanel.add(new ResultsFor("", actionToPrint));
 										for (EnhancedFeed feed : feeds) {
 											newsPanel.add(new TweetTemplate(false, showFeedTimelineSource, myUserInfo, feed, eventBus)); //in the view
 											// save them (they will be used when asking more feeds)
@@ -712,7 +712,7 @@ public class NewsFeedPanel extends Composite {
 
 									GWT.log("Retrieved " + feeds.size() + " hits for search.");
 									if (feeds.size() == 0) { 
-										newsPanel.add(new ResultsFor("results for", query));
+										newsPanel.add(new ResultsFor("Results for query ", query));
 										newsPanel.add(new HTML("<div class=\"nofeed-message\" style=\"height: 200px;\">" +
 												"Sorry, looks like we found no match for: " + query +"</div>"));
 									}
@@ -720,7 +720,7 @@ public class NewsFeedPanel extends Composite {
 										newsPanel.setHeight("");
 										newsPanel.setHorizontalAlignment(HasAlignment.ALIGN_LEFT);
 										newsPanel.setVerticalAlignment(HasVerticalAlignment.ALIGN_TOP);
-										newsPanel.add(new ResultsFor("results for", query));
+										newsPanel.add(new ResultsFor("Results for query ", query));
 										for (EnhancedFeed feed : feeds) {
 											newsPanel.add(new TweetTemplate(false, showFeedTimelineSource, myUserInfo, feed, eventBus)); //in the view
 											// save them (they will be used when asking more feeds)