diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/spinner_earth.gif b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/spinner_earth.gif
index 17b552c..663a401 100644
Binary files a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/spinner_earth.gif and b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/spinner_earth.gif differ
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/spinner_earth2.gif b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/spinner_earth2.gif
new file mode 100644
index 0000000..17b552c
Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/resources/spinner_earth2.gif differ
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/search/SearchFacilityUI.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/search/SearchFacilityUI.java
index b3b381c..9735fa9 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/search/SearchFacilityUI.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/search/SearchFacilityUI.java
@@ -286,7 +286,8 @@ public class SearchFacilityUI extends Composite {
 					@Override
 					public void onSuccess(ResultSetPaginatedDataIDs result) {
 
-						appManagerBus.fireEvent(new SearchPerformedEvent(profileID, result.getResultSetProjectIDs(), false));
+						appManagerBus
+								.fireEvent(new SearchPerformedEvent(profileID, result.getResultSetProjectIDs(), false));
 
 						setSearchEnabled(true);
 						latestResult = result;
@@ -304,18 +305,18 @@ public class SearchFacilityUI extends Composite {
 
 						String message = "";
 						if (allItems > returnedItems) {
-							message = "Too many results found. Below are " + returnedItems + " out of " + allItems
-									+ " results";
-						} else if (returnedItems>0){
+							message = "Your query returns too many results (" + allItems
+									+ "). Please find below the top " + returnedItems + ".<br>";
+						} else if (returnedItems > 0) {
 							message = "Found " + returnedItems;
 							message += returnedItems > 0 ? " items" : " item";
-							
+							message += ". ";
 						}
-						
-						if (returnedItems>0) {
-							message += ". Projects (with a centroid) matching your search are shown on the Map";
+
+						if (returnedItems > 0) {
+							message += "On the map you can see all the projects with a centroid matching the query";
 						}
-						
+
 						HTML resultMessage = new HTML(message);
 						resultMessage.getElement().addClassName("search_result_msg");
 
@@ -353,7 +354,7 @@ public class SearchFacilityUI extends Composite {
 								public void onClick(ClickEvent event) {
 									GeoportalItemReferences gir = new GeoportalItemReferences(resultDoc.getProjectID(),
 											profileID);
-									//here
+									// here
 									appManagerBus.fireEvent(new ClosedViewDetailsEvent());
 									appManagerBus.fireEvent(new ShowDetailsEvent(gir, null, true));
 									appManagerBus.fireEvent(new ShowPopupOnCentroiEvent(profileID,
diff --git a/src/test/java/org/gcube/portlets/user/geoportaldataviewer/GeoportalViewer_Tests.java b/src/test/java/org/gcube/portlets/user/geoportaldataviewer/GeoportalViewer_Tests.java
index ee29a71..c217fa4 100644
--- a/src/test/java/org/gcube/portlets/user/geoportaldataviewer/GeoportalViewer_Tests.java
+++ b/src/test/java/org/gcube/portlets/user/geoportaldataviewer/GeoportalViewer_Tests.java
@@ -71,7 +71,7 @@ public class GeoportalViewer_Tests {
 	 *
 	 * @return the client
 	 */
-	@Before
+	//@Before
 	public void getClient() {
 		// assumeTrue(GCubeTest.isTestInfrastructureEnabled());
 		ScopeProvider.instance.set(CONTEXT);
@@ -274,7 +274,7 @@ public class GeoportalViewer_Tests {
 	}
 	
 
-	@Test
+	//@Test
 	public void getResultsWithSize() throws Exception {
 		// List<Project> listOfProjects = client.getListForProfileID(PROFILE_ID);