Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/ProjectDaoImpl.java
===================================================================
--- eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/ProjectDaoImpl.java	(revision 2891130e227f197251f7db5d715f19e844701025)
+++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/ProjectDaoImpl.java	(revision f1bf82ba8c84fbdc62fe2d8d4a4a04e2c76c722c)
@@ -89,6 +89,6 @@
 			return getEntityManager().createQuery("""
 					select p
-					from Project p
-					join p.courseProjects cp
+					from CourseProject cp
+					join cp.project p
 					join cp.course c
 					where c.courseId=:courseId
Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivityTypes.java
===================================================================
--- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivityTypes.java	(revision 2891130e227f197251f7db5d715f19e844701025)
+++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivityTypes.java	(revision f1bf82ba8c84fbdc62fe2d8d4a4a04e2c76c722c)
@@ -23,16 +23,19 @@
 public class ManageActivityTypes {
 
-	@Persist
-	@Property
-	private ActivityType newActivityType;
+	@InjectComponent
+	private Zone zoneActivityTypes;
+
+	@Inject
+	private GenericService genericService;
+
+	@Inject
+	private SelectModelFactory selectModelFactory;
 
 	@Property
 	private ActivityType activityType;
 
+	@Persist
 	@Property
-	private ActivityType activityType2;
-
-	@Inject
-	private GenericService genericService;
+	private ActivityType newActivityType;
 
 	public void onActionFromNewActivityType() {
@@ -43,16 +46,4 @@
 		newActivityType = at;
 	}
-
-	@InjectComponent
-	private Zone zoneActivityTypes;
-
-	@CommitAfter
-	public void onSuccessFromNewActivityTypeForm() {
-		genericService.saveOrUpdate(newActivityType);
-		newActivityType = null;
-	}
-
-	@Inject
-	private SelectModelFactory selectModelFactory;
 
 	public SelectModel getListTypes() {
@@ -67,8 +58,4 @@
 	}
 
-	@Persist
-	@Property
-	private ActivityType selectedActivityType;
-
 	public Long getDepth(ActivityType at) {
 		if (at.getSuperActivityType() != null) {
@@ -80,5 +67,18 @@
 
 	public long getHierarchicalDepth() {
-		return (3*getDepth(activityType));
+		return (3 * getDepth(activityType));
+	}
+
+	public void onActivate() {
+		if (newActivityType != null) {
+			newActivityType = genericService.getByPK(ActivityType.class, newActivityType.getActivityTypeId());
+
+		}
+	}
+
+	@CommitAfter
+	public void onSuccessFromNewActivityTypeForm() {
+		genericService.saveOrUpdate(newActivityType);
+		newActivityType = null;
 	}
 
Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.java
===================================================================
--- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.java	(revision 2891130e227f197251f7db5d715f19e844701025)
+++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.java	(revision f1bf82ba8c84fbdc62fe2d8d4a4a04e2c76c722c)
@@ -1,4 +1,5 @@
 package info.ajanovski.eprms.tap.pages.admin;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -66,13 +67,15 @@
 
 	public List<Project> getAllProjects() {
+		List<Project> list = new ArrayList<Project>();
 		if (selectedCourse == null) {
-			return ((List<Project>) projectManager.getAllProjectsOrderByTitle()).stream()
-					.filter(c -> c.getStatus() != null && c.getStatus().equals(ModelConstants.ProjectStatusActive))
+			list = ((List<Project>) projectManager.getAllProjectsOrderByTitle()).stream()
+					.filter(c -> (c.getStatus() != null && c.getStatus().equals(ModelConstants.ProjectStatusActive)))
 					.collect(Collectors.toList());
 		} else {
-			return ((List<Project>) projectManager.getCourseProjectsOrderByTitle(selectedCourse)).stream()
-					.filter(c -> c.getStatus() != null && c.getStatus().equals(ModelConstants.ProjectStatusActive))
+			list = ((List<Project>) projectManager.getCourseProjectsOrderByTitle(selectedCourse)).stream()
+					.filter(c -> (c.getStatus() != null && c.getStatus().equals(ModelConstants.ProjectStatusActive)))
 					.collect(Collectors.toList());
 		}
+		return list;
 	}
 
Index: eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.tml
===================================================================
--- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.tml	(revision 2891130e227f197251f7db5d715f19e844701025)
+++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.tml	(revision f1bf82ba8c84fbdc62fe2d8d4a4a04e2c76c722c)
@@ -46,4 +46,5 @@
 	</div>
 </div>
+
 
 <div t:type="if" t:test="selectedCourse">