diff --git a/ccm-cms/package-lock.json b/ccm-cms/package-lock.json
index 17402fd86..030e71daf 100644
--- a/ccm-cms/package-lock.json
+++ b/ccm-cms/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@librecms/ccm-cms",
-    "version": "7.0.0-SNAPSHOT.2023-02-18T145938",
+    "version": "7.0.0-SNAPSHOT.2023-02-22T184921",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "@librecms/ccm-cms",
-            "version": "7.0.0-SNAPSHOT.2023-02-18T145938",
+            "version": "7.0.0-SNAPSHOT.2023-02-22T184921",
             "license": "LGPL-3.0-or-later",
             "dependencies": {
                 "@tiptap/core": "^2.0.0-beta.127",
diff --git a/ccm-cms/package.json b/ccm-cms/package.json
index 497974e4f..ded9446b4 100644
--- a/ccm-cms/package.json
+++ b/ccm-cms/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@librecms/ccm-cms",
-    "version": "7.0.0-SNAPSHOT.2023-02-18T145938",
+    "version": "7.0.0-SNAPSHOT.2023-02-22T184921",
     "description": "JavaScript stuff for ccm-cms",
     "main": "target/generated-resources/assets/@content-sections/cms-admin.js",
     "types": "target/generated-resources/assets/@content-sections/cms-admin.d.ts",
diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionImExporter.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionImExporter.java
index c538cbdce..757ce2d6d 100644
--- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionImExporter.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionImExporter.java
@@ -51,6 +51,7 @@ public class ContentSectionImExporter
         addRequiredEntities(
             Set.of(
                 Category.class,
+                Folder.class,
                 ResourceType.class,
                 LifecycleDefinition.class,
                 Workflow.class
diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/Folder.java b/ccm-cms/src/main/java/org/librecms/contentsection/Folder.java
index 0029a10ae..714ab802b 100644
--- a/ccm-cms/src/main/java/org/librecms/contentsection/Folder.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/Folder.java
@@ -321,9 +321,11 @@ public class Folder extends Category implements Serializable {
     @JoinTable(
         name = "FOLDER_CONTENT_SECTION_MAP", schema = DB_SCHEMA,
         inverseJoinColumns = {
-            @JoinColumn(name = "CONTENT_SECTION_ID")},
+            @JoinColumn(name = "CONTENT_SECTION_ID")
+        },
         joinColumns = {
-            @JoinColumn(name = "FOLDER_ID")}
+            @JoinColumn(name = "FOLDER_ID")
+        }
     )
     @JsonIdentityReference(alwaysAsId = true)
     private ContentSection section;