diff --git a/src/main/java/org/ohdsi/webapi/feanalysis/FeAnalysisController.java b/src/main/java/org/ohdsi/webapi/feanalysis/FeAnalysisController.java
index e290875295..a7456abfd6 100644
--- a/src/main/java/org/ohdsi/webapi/feanalysis/FeAnalysisController.java
+++ b/src/main/java/org/ohdsi/webapi/feanalysis/FeAnalysisController.java
@@ -153,6 +153,7 @@ public void deleteAnalysis(@PathParam("id") final Integer feAnalysisId) {
      * @return ID, type, name domain, description, etc of feature analysis
      */
     @GET
+    @Transactional
     @Path("/{id}")
     @Produces(MediaType.APPLICATION_JSON)
     public FeAnalysisDTO getFeAnalysis(@PathParam("id") final Integer feAnalysisId) {
diff --git a/src/main/java/org/ohdsi/webapi/feanalysis/converter/FeAnalysisEntityToFeAnalysisDTOConverter.java b/src/main/java/org/ohdsi/webapi/feanalysis/converter/FeAnalysisEntityToFeAnalysisDTOConverter.java
index f39f12cd2f..f215237149 100644
--- a/src/main/java/org/ohdsi/webapi/feanalysis/converter/FeAnalysisEntityToFeAnalysisDTOConverter.java
+++ b/src/main/java/org/ohdsi/webapi/feanalysis/converter/FeAnalysisEntityToFeAnalysisDTOConverter.java
@@ -7,6 +7,7 @@
 import org.ohdsi.webapi.feanalysis.dto.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.hibernate.Hibernate;
 
 import java.util.List;
 import java.util.Objects;
@@ -46,6 +47,7 @@ private Object convertDesignToJson(final FeAnalysisEntity source) {
         switch (source.getType()) {
             case CRITERIA_SET:
                 FeAnalysisWithCriteriaEntity<?> sourceWithCriteria = (FeAnalysisWithCriteriaEntity<?>) source;
+                Hibernate.initialize(sourceWithCriteria.getDesign());  // Explicitly initialize the collection
                 return sourceWithCriteria.getDesign()
                           .stream()
                           .map(this::convertCriteria)
diff --git a/src/main/java/org/ohdsi/webapi/shiro/filters/TeamProjectBasedAuthorizingFilter.java b/src/main/java/org/ohdsi/webapi/shiro/filters/TeamProjectBasedAuthorizingFilter.java
index 3b4503cae9..670ed717cf 100644
--- a/src/main/java/org/ohdsi/webapi/shiro/filters/TeamProjectBasedAuthorizingFilter.java
+++ b/src/main/java/org/ohdsi/webapi/shiro/filters/TeamProjectBasedAuthorizingFilter.java
@@ -146,8 +146,8 @@ private boolean checkGen3Authorization(String teamProjectRole, String login) thr
       JSONArray teamProjectAuthorizations = jsonObject.getJSONArray(teamProjectRole);
       logger.debug("Found authorizations={}", teamProjectAuthorizations);
       // We expect two authorization rules per teamproject:
-      if (teamProjectAuthorizations.length() != 2) {
-        logger.error("Two authorization rules expected for 'teamproject'={}, found={}", teamProjectRole,
+      if (teamProjectAuthorizations.length() != 3) {
+        logger.error("Three authorization rules expected for 'teamproject'={}, found={}", teamProjectRole,
           teamProjectAuthorizations.length());
         return false;
       }