diff --git a/cedar-openview-server-application/src/main/java/org/metadatacenter/cedar/openview/resources/FoldersResource.java b/cedar-openview-server-application/src/main/java/org/metadatacenter/cedar/openview/resources/FoldersResource.java
index c41c456..0ea43cb 100644
--- a/cedar-openview-server-application/src/main/java/org/metadatacenter/cedar/openview/resources/FoldersResource.java
+++ b/cedar-openview-server-application/src/main/java/org/metadatacenter/cedar/openview/resources/FoldersResource.java
@@ -72,6 +72,7 @@ public Response findFolder(@PathParam(PP_ID) String id,
         for (FolderServerResourceExtract parent : pathInfo) {
           if (parent.getIsOpen() != null && parent.getIsOpen()) {
             foundOpenParent = true;
+            break;
           }
         }
         if (!foundOpenParent) {
diff --git a/cedar-openview-server-application/src/main/java/org/metadatacenter/cedar/openview/resources/TemplateElementsResource.java b/cedar-openview-server-application/src/main/java/org/metadatacenter/cedar/openview/resources/TemplateElementsResource.java
index 77460fe..5a77eaf 100644
--- a/cedar-openview-server-application/src/main/java/org/metadatacenter/cedar/openview/resources/TemplateElementsResource.java
+++ b/cedar-openview-server-application/src/main/java/org/metadatacenter/cedar/openview/resources/TemplateElementsResource.java
@@ -30,7 +30,7 @@ public class TemplateElementsResource extends AbstractOpenViewResource {
 
   public TemplateElementsResource(CedarConfig cedarConfig, TemplateElementService<String, JsonNode> templateElementService) {
     super(cedarConfig);
-    this.templateElementService = templateElementService;
+    TemplateElementsResource.templateElementService = templateElementService;
   }
 
   @GET
diff --git a/cedar-openview-server-application/src/main/java/org/metadatacenter/cedar/openview/resources/TemplateFieldsResource.java b/cedar-openview-server-application/src/main/java/org/metadatacenter/cedar/openview/resources/TemplateFieldsResource.java
index ffc91ba..a55dc43 100644
--- a/cedar-openview-server-application/src/main/java/org/metadatacenter/cedar/openview/resources/TemplateFieldsResource.java
+++ b/cedar-openview-server-application/src/main/java/org/metadatacenter/cedar/openview/resources/TemplateFieldsResource.java
@@ -30,7 +30,7 @@ public class TemplateFieldsResource extends AbstractOpenViewResource {
 
   public TemplateFieldsResource(CedarConfig cedarConfig, TemplateFieldService<String, JsonNode> templateFieldService) {
     super(cedarConfig);
-    this.templateFieldService = templateFieldService;
+    TemplateFieldsResource.templateFieldService = templateFieldService;
   }
 
   @GET
diff --git a/cedar-openview-server-application/src/main/java/org/metadatacenter/cedar/openview/resources/TemplateInstancesResource.java b/cedar-openview-server-application/src/main/java/org/metadatacenter/cedar/openview/resources/TemplateInstancesResource.java
index 9027d62..1638f6a 100644
--- a/cedar-openview-server-application/src/main/java/org/metadatacenter/cedar/openview/resources/TemplateInstancesResource.java
+++ b/cedar-openview-server-application/src/main/java/org/metadatacenter/cedar/openview/resources/TemplateInstancesResource.java
@@ -30,7 +30,7 @@ public class TemplateInstancesResource extends AbstractOpenViewResource {
 
   public TemplateInstancesResource(CedarConfig cedarConfig, TemplateInstanceService<String, JsonNode> templateInstanceService) {
     super(cedarConfig);
-    this.templateInstanceService = templateInstanceService;
+    TemplateInstancesResource.templateInstanceService = templateInstanceService;
   }
 
   @GET
diff --git a/cedar-openview-server-application/src/main/java/org/metadatacenter/cedar/openview/resources/TemplatesResource.java b/cedar-openview-server-application/src/main/java/org/metadatacenter/cedar/openview/resources/TemplatesResource.java
index f6b6853..541079e 100644
--- a/cedar-openview-server-application/src/main/java/org/metadatacenter/cedar/openview/resources/TemplatesResource.java
+++ b/cedar-openview-server-application/src/main/java/org/metadatacenter/cedar/openview/resources/TemplatesResource.java
@@ -30,7 +30,7 @@ public class TemplatesResource extends AbstractOpenViewResource {
 
   public TemplatesResource(CedarConfig cedarConfig, TemplateService<String, JsonNode> templateService) {
     super(cedarConfig);
-    this.templateService = templateService;
+    TemplatesResource.templateService = templateService;
   }
 
   @GET