diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 8970fcf..7917f92 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                                                                                                                                                                                                                                                                                        	
+                                                                                                                                                                                                                                                                                            	
+    
     
     
     
@@ -70,7 +71,8 @@
     
     
     <wb-module deploy-name="geoportal-data-entry-app-3.0.0">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+        
         
         
         
@@ -141,7 +143,8 @@
         
         
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+        
         
         
         
@@ -212,7 +215,8 @@
         
         
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+        
         
         
         
@@ -283,7 +287,8 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                                                                                                                                                                        
+                                                                                                                                                                                                
+        
         
         
         
@@ -306,10 +311,8 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="geoportal-data-common-2.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/geoportal-data-common/geoportal-data-common">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+        
         
         
         
@@ -380,7 +383,8 @@
         
         
         <property name="context-root" value="geoportal-data-entry-app"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+        
         
         
         
@@ -451,7 +455,8 @@
         
         
         <property name="java-output-path" value="/geoportal-data-entry-app/target/geoportal-data-entry-app-2.0.0-SNAPSHOT/WEB-INF/classes"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                	
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        	
+    
     
     
     
@@ -522,7 +527,8 @@
     
     
     </wb-module>
-                                                                                                                                                                                                                                                                                        
+                                                                                                                                                                                                                                                                                            
+
 
 
 
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java
index 232de88..002a044 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java
@@ -10,8 +10,12 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
 import org.apache.commons.io.FileUtils;
 import org.bson.Document;
@@ -505,6 +509,8 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen
 			ProjectsCaller client = GeoportalClientCaller.projects();
 			SessionUtil.getCurrentContext(getThreadLocalRequest(), true);
 
+			ResultSetPaginatedData searchedData = new ResultSetPaginatedData();
+
 			Integer totalProjectForProfile = SessionUtil.getTotalDocumentForProfileID(getThreadLocalRequest(),
 					theProfileID);
 
@@ -513,26 +519,52 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen
 				SessionUtil.setTotalDocumentForProfileID(getThreadLocalRequest(), theProfileID, totalProjectForProfile);
 			}
 
+			searchedData.setTotalItems(totalProjectForProfile);
 			LOG.info("Total Docs read from config: " + totalProjectForProfile);
-
-			Iterator<Project> projects = client.queryOnMongo(theProfileID, totalProjectForProfile, start, limit,
+			
+			// Saving client PROJECTION
+			LinkedHashMap<String, Object> originalProjection = filter.getProjection();
+			int totalItems = totalProjectForProfile;
+			//PERFORMING FIRST QUERY FOR IDS IF AND ONLY IF WHERE CONDITIONS IN THE QUERY. 
+			//SEARCHING FACILITY IS ENACTING.
+			if(filter.getConditions()!=null) {
+				
+				// Setting PROJECTION ONLY FOR PROEJCT ID
+				LinkedHashMap<String, Object> projectionForIDs = new LinkedHashMap<String, Object>();
+				projectionForIDs.put(Project.ID, 1);
+				filter.setProjection(projectionForIDs);
+				
+				// FIRST QUERY TO RETRIEVE IDs
+				// LIMIT IS NULL MEANS THAT IT IS EQUAL TO NUMBER TOTAL OF DOCUMENTS
+				//Calculating always the size starting from 0
+				final Iterator<Project> projectsIDs = client.queryOnMongo(theProfileID, totalProjectForProfile, 0, null,
+						filter);
+	
+				//Getting the Project IDs from the Iterable
+				Iterable<Project> itP = () -> projectsIDs;
+				Stream<Project> targetStream = StreamSupport.stream(itP.spliterator(), false);
+				List<String> listProjectIDs = targetStream.map(Project::getId).collect(Collectors.toList());
+				totalItems = listProjectIDs.size();
+				searchedData.setTotalItems(totalItems);
+				LOG.info("Total Docs read from query per ID: " + totalItems);
+			}
+			
+			//NOW PERFORMING THE (REAL) SECOND QUERY FROM CLIENT
+			// SETTING ORIGINAL PROJECTION FROM CLIENT
+			filter.setProjection(originalProjection);
+			// LIMIT IS FROM CLIENT
+			Iterator<Project> projects = client.queryOnMongo(theProfileID, totalItems, start, limit,
 					filter);
 
-			ResultSetPaginatedData searchedData = new ResultSetPaginatedData(start, limit, false);
-			searchedData.setTotalItems(totalProjectForProfile);
+			searchedData.setClientStartIndex(start);
+			searchedData.setLimit(limit);
+			searchedData.setServerSearchFinished(false);
 
 			List<ResultDocumentDV> toReturnList = ConvertToDataValueObjectModel.toListResultDocument(projects);
-
 			searchedData.setData(toReturnList);
-
-			// TODO BUGGY WORKAROUND. BLOCKED BY #22487 IT MUST BE REMOVE AFTER THE QUERY
-			// COUNT
-			// AND LIST.SIZE BY QUERY WILL BE AVAILABLE IN THE SERVICE
-			if (filter.getConditions() != null) {
-				int totalItems = toReturnList.size();
-				searchedData.setTotalItems(totalItems);
-			}
-
+			
+			LOG.info("Total Docs page size returned:" + toReturnList.size() + ", start: " + start + ", limit: " + limit);
+			
 			if (totalProjectForProfile == limit || totalProjectForProfile == 0) {
 				LOG.debug("Page completed returning " + totalProjectForProfile + " projects");
 				int newOffset = start + limit;