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 558c7bb2..7c109751 100644
--- a/src/Controller/AdminPages/BaseAdminController.php
+++ b/src/Controller/AdminPages/BaseAdminController.php
@@ -383,6 +383,12 @@ abstract class BaseAdminController extends AbstractController
             if (count($results) > 0) {
                 $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/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));
     }
 
     /**