diff --git a/concessioni-lifecycle/src/main/java/org/gcube/application/cms/concessioni/plugins/ConcessioniLifeCycleManager.java b/concessioni-lifecycle/src/main/java/org/gcube/application/cms/concessioni/plugins/ConcessioniLifeCycleManager.java
index c83eb39..fc5d7ba 100644
--- a/concessioni-lifecycle/src/main/java/org/gcube/application/cms/concessioni/plugins/ConcessioniLifeCycleManager.java
+++ b/concessioni-lifecycle/src/main/java/org/gcube/application/cms/concessioni/plugins/ConcessioniLifeCycleManager.java
@@ -210,20 +210,23 @@ public class ConcessioniLifeCycleManager extends Default3PhaseManager implements
 			}
 
 			log.trace("Checking from LAST.. ");
+			
+			//I'm ignoring the phase, this code is called on 
+			// SUBMIT (DRAFT-> PENDING_APPROVAL)
+			// APPROVE (PENDING_APPROVAL -> PUBLISH
+			//
 
 			for (int i = 0; i < projects.size(); i++) {
 
 				Project p = projects.get(i);
-				//String phase = p.getLifecycleInformation().getPhase();
+				String phase = p.getLifecycleInformation().getPhase();
 
-				// IS TO DISPLAY EMPTY? Step into only once
+				// IS TO DISPLAY EMPTY? Step into only once. Indexing the first project that is in PENDING APPROVAL or PUBLISHED
 				if (toDisplayId.isEmpty()) {
 					// IF PHASE IS PENDING APPROVAL OR PUBLISHED adding toDisplayId
-//					if ((phase.equals(Phases.PENDING_APPROVAL) || phase.equals(Phases.PUBLISHED))) {
-//						toDisplayId.add(p.getId());
-//					}
-					
-					toDisplayId.add(p.getId());
+					if ((phase.equals(Phases.PENDING_APPROVAL) || phase.equals(Phases.PUBLISHED))) {
+						toDisplayId.add(p.getId());
+					}
 					
 				} else {