diff --git a/VERSION b/VERSION
index c043eea7..276cbf9e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.1
+2.3.0
diff --git a/config/packages/translation.yaml b/config/packages/translation.yaml
index a3f529e3..cbc1cd7e 100644
--- a/config/packages/translation.yaml
+++ b/config/packages/translation.yaml
@@ -1,7 +1,7 @@
 framework:
     default_locale: 'en'
     # Just enable the locales we need for performance reasons.
-    enabled_locale: ['en', 'de', 'it', 'fr', 'ru', 'ja', 'cs', 'da', 'zh', 'pl']
+    enabled_locale: '%partdb.locale_menu%'
     translator:
         default_path: '%kernel.project_dir%/translations'
         fallbacks:
diff --git a/src/Controller/AdminPages/BaseAdminController.php b/src/Controller/AdminPages/BaseAdminController.php
index e7dd7421..7c109751 100644
--- a/src/Controller/AdminPages/BaseAdminController.php
+++ b/src/Controller/AdminPages/BaseAdminController.php
@@ -366,6 +366,14 @@ abstract class BaseAdminController extends AbstractController
                 }
             }
 
+            //Count how many actual new entities were created (id is null until persisted)
+            $created_count = 0;
+            foreach ($results as $result) {
+                if (null === $result->getID()) {
+                    $created_count++;
+                }
+            }
+
             //Persist valid entities to DB
             foreach ($results as $result) {
                 $em->persist($result);
@@ -373,8 +381,14 @@ abstract class BaseAdminController extends AbstractController
             $em->flush();
 
             if (count($results) > 0) {
-                $this->addFlash('success', t('entity.mass_creation_flash', ['%COUNT%' => count($results)]));
+                $this->addFlash('success', t('entity.mass_creation_flash', ['%COUNT%' => $created_count]));
             }
+
+            if (count($errors)) {
+                //Recreate mass creation form, so we get the updated parent list and empty lines
+                $mass_creation_form = $this->createForm(MassCreationForm::class, ['entity_class' => $this->entity_class]);
+            }
+
         }
 
         return $this->render($this->twig_template, [
diff --git a/src/Entity/Attachments/Attachment.php b/src/Entity/Attachments/Attachment.php
index 08aacaa0..259785cb 100644
--- a/src/Entity/Attachments/Attachment.php
+++ b/src/Entity/Attachments/Attachment.php
@@ -169,7 +169,7 @@ abstract class Attachment extends AbstractNamedDBElement
     #[ORM\Column(type: Types::STRING, length: 2048,  nullable: true)]
     #[Groups(['attachment:read'])]
     #[ApiProperty(example: 'http://example.com/image.jpg')]
-    #[Assert\Length(2048)]
+    #[Assert\Length(max: 2048)]
     protected ?string $external_path = null;
 
     /**
diff --git a/src/Repository/StructuralDBElementRepository.php b/src/Repository/StructuralDBElementRepository.php
index 781c7622..7fc38671 100644
--- a/src/Repository/StructuralDBElementRepository.php
+++ b/src/Repository/StructuralDBElementRepository.php
@@ -243,6 +243,14 @@ class StructuralDBElementRepository extends AttachmentContainingDBElementReposit
             return $result[0];
         }
 
+        //If the name contains category delimiters like ->, try to find the element by its full path
+        if (str_contains($name, '->')) {
+            $tmp = $this->getEntityByPath($name, '->');
+            if (count($tmp) > 0) {
+                return $tmp[count($tmp) - 1];
+            }
+        }
+
         //If we find nothing, return null
         return null;
     }
diff --git a/src/Services/ImportExportSystem/EntityImporter.php b/src/Services/ImportExportSystem/EntityImporter.php
index 459866ba..a89be9dc 100644
--- a/src/Services/ImportExportSystem/EntityImporter.php
+++ b/src/Services/ImportExportSystem/EntityImporter.php
@@ -167,7 +167,7 @@ class EntityImporter
         }
 
         //Only return objects once
-        return array_values(array_unique($valid_entities));
+        return array_values(array_unique($valid_entities, SORT_REGULAR));
     }
 
     /**
diff --git a/src/Services/ImportExportSystem/PartKeeprImporter/PKDatastructureImporter.php b/src/Services/ImportExportSystem/PartKeeprImporter/PKDatastructureImporter.php
index 9e674f05..ec23d34b 100644
--- a/src/Services/ImportExportSystem/PartKeeprImporter/PKDatastructureImporter.php
+++ b/src/Services/ImportExportSystem/PartKeeprImporter/PKDatastructureImporter.php
@@ -152,7 +152,7 @@ class PKDatastructureImporter
     public function importPartCustomStates(array $data): int
     {
         if (!isset($data['partcustomstate'])) {
-            throw new \RuntimeException('$data must contain a "partcustomstate" key!');
+            return 0; //Not all PartKeepr installations have custom states
         }
 
         $partCustomStateData = $data['partcustomstate'];
diff --git a/src/Services/ImportExportSystem/PartKeeprImporter/PKImportHelperTrait.php b/src/Services/ImportExportSystem/PartKeeprImporter/PKImportHelperTrait.php
index 1e4cd3ba..64127341 100644
--- a/src/Services/ImportExportSystem/PartKeeprImporter/PKImportHelperTrait.php
+++ b/src/Services/ImportExportSystem/PartKeeprImporter/PKImportHelperTrait.php
@@ -150,6 +150,11 @@ trait PKImportHelperTrait
 
             $target->addAttachment($attachment);
             $this->em->persist($attachment);
+
+            //If the attachment is an image, and the target has no master picture yet, set it
+            if ($attachment->isPicture() && $target->getMasterPictureAttachment() === null) {
+                $target->setMasterPictureAttachment($attachment);
+            }
         }
 
         $this->em->flush();
diff --git a/src/Services/ImportExportSystem/PartKeeprImporter/PKPartImporter.php b/src/Services/ImportExportSystem/PartKeeprImporter/PKPartImporter.php
index ab06a134..cab5a49b 100644
--- a/src/Services/ImportExportSystem/PartKeeprImporter/PKPartImporter.php
+++ b/src/Services/ImportExportSystem/PartKeeprImporter/PKPartImporter.php
@@ -91,7 +91,10 @@ class PKPartImporter
                     $this->setAssociationField($entity, 'partUnit', MeasurementUnit::class, $part['partUnit_id']);
                 }
 
-                $this->setAssociationField($entity, 'partCustomState', MeasurementUnit::class, $part['partCustomState_id']);
+                if (isset($part['partCustomState_id'])) {
+                    $this->setAssociationField($entity, 'partCustomState', MeasurementUnit::class,
+                        $part['partCustomState_id']);
+                }
 
                 //Create a part lot to store the stock level and location
                 $lot = new PartLot();