diff --git a/cobertura.xml b/cobertura.xml
index c593e50..206d7ea 100644
--- a/cobertura.xml
+++ b/cobertura.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
-<coverage line-rate="0.7401282483969" branch-rate="0" lines-covered="2193" lines-valid="2963" branches-covered="0" branches-valid="0" complexity="1336" version="0.4" timestamp="1752569114">
+<coverage line-rate="0.73698354047699" branch-rate="0" lines-covered="2194" lines-valid="2977" branches-covered="0" branches-valid="0" complexity="1340" version="0.4" timestamp="1752699373">
   <sources>
     <source>/home/thomas/projekte/calc/src</source>
   </sources>
@@ -5976,9 +5976,9 @@
         </class>
       </classes>
     </package>
-    <package name="Option/Parser/Select.php" line-rate="0.87254901960784" branch-rate="0" complexity="49">
+    <package name="Option/Parser/Select.php" line-rate="0.77586206896552" branch-rate="0" complexity="53">
       <classes>
-        <class name="PSC\Library\Calc\Option\Parser\Select" filename="Option/Parser/Select.php" line-rate="0.87254901960784" branch-rate="0" complexity="49">
+        <class name="PSC\Library\Calc\Option\Parser\Select" filename="Option/Parser/Select.php" line-rate="0.77586206896552" branch-rate="0" complexity="53">
           <methods>
             <method name="__construct" signature="null|string $mode" line-rate="1" branch-rate="0" complexity="7">
               <lines>
@@ -6048,14 +6048,14 @@
                 <line number="119" hits="0"/>
               </lines>
             </method>
-            <method name="parseModePapierDbXML" signature="" line-rate="0.93333333333333" branch-rate="0" complexity="5">
+            <method name="parseModePapierDbXML" signature="" line-rate="1" branch-rate="0" complexity="5">
               <lines>
                 <line number="125" hits="67"/>
                 <line number="126" hits="67"/>
-                <line number="128" hits="67"/>
-                <line number="130" hits="67"/>
-                <line number="133" hits="66"/>
-                <line number="135" hits="66"/>
+                <line number="127" hits="67"/>
+                <line number="129" hits="67"/>
+                <line number="131" hits="67"/>
+                <line number="134" hits="66"/>
                 <line number="136" hits="66"/>
                 <line number="137" hits="66"/>
                 <line number="138" hits="66"/>
@@ -6064,82 +6064,96 @@
                 <line number="141" hits="66"/>
                 <line number="142" hits="66"/>
                 <line number="143" hits="66"/>
-                <line number="148" hits="0"/>
+                <line number="144" hits="66"/>
               </lines>
             </method>
-            <method name="parseModePapierDbJson" signature="" line-rate="0" branch-rate="0" complexity="1">
+            <method name="parseModePapierDbJson" signature="" line-rate="0" branch-rate="0" complexity="5">
               <lines>
+                <line number="153" hits="0"/>
                 <line number="154" hits="0"/>
+                <line number="155" hits="0"/>
+                <line number="157" hits="0"/>
+                <line number="159" hits="0"/>
+                <line number="162" hits="0"/>
+                <line number="164" hits="0"/>
+                <line number="165" hits="0"/>
+                <line number="166" hits="0"/>
+                <line number="167" hits="0"/>
+                <line number="168" hits="0"/>
+                <line number="169" hits="0"/>
+                <line number="170" hits="0"/>
+                <line number="171" hits="0"/>
+                <line number="172" hits="0"/>
               </lines>
             </method>
             <method name="parseModeColorDbXML" signature="" line-rate="1" branch-rate="0" complexity="5">
               <lines>
-                <line number="159" hits="8"/>
-                <line number="161" hits="8"/>
-                <line number="163" hits="8"/>
-                <line number="164" hits="1"/>
-                <line number="166" hits="1"/>
-                <line number="168" hits="1"/>
-                <line number="169" hits="1"/>
-                <line number="171" hits="1"/>
-                <line number="172" hits="1"/>
-                <line number="175" hits="1"/>
-                <line number="176" hits="1"/>
-                <line number="177" hits="1"/>
-                <line number="178" hits="1"/>
-                <line number="179" hits="1"/>
-                <line number="180" hits="1"/>
-                <line number="181" hits="1"/>
-                <line number="182" hits="1"/>
-                <line number="183" hits="1"/>
-                <line number="184" hits="1"/>
-                <line number="185" hits="1"/>
+                <line number="181" hits="8"/>
+                <line number="183" hits="8"/>
+                <line number="185" hits="8"/>
                 <line number="186" hits="1"/>
+                <line number="188" hits="1"/>
                 <line number="190" hits="1"/>
-                <line number="191" hits="8"/>
-                <line number="193" hits="8"/>
-                <line number="195" hits="8"/>
+                <line number="191" hits="1"/>
+                <line number="193" hits="1"/>
+                <line number="194" hits="1"/>
+                <line number="197" hits="1"/>
+                <line number="198" hits="1"/>
+                <line number="199" hits="1"/>
+                <line number="200" hits="1"/>
+                <line number="201" hits="1"/>
+                <line number="202" hits="1"/>
+                <line number="203" hits="1"/>
+                <line number="204" hits="1"/>
+                <line number="205" hits="1"/>
+                <line number="206" hits="1"/>
+                <line number="207" hits="1"/>
+                <line number="208" hits="1"/>
+                <line number="212" hits="1"/>
+                <line number="213" hits="8"/>
+                <line number="215" hits="8"/>
+                <line number="217" hits="8"/>
               </lines>
             </method>
             <method name="parseModeColorDbJson" signature="" line-rate="0" branch-rate="0" complexity="1">
               <lines>
-                <line number="200" hits="0"/>
+                <line number="222" hits="0"/>
               </lines>
             </method>
             <method name="parseModeNormalXML" signature="" line-rate="1" branch-rate="0" complexity="2">
               <lines>
-                <line number="205" hits="126"/>
-                <line number="206" hits="122"/>
-                <line number="207" hits="122"/>
-                <line number="208" hits="122"/>
+                <line number="227" hits="126"/>
+                <line number="228" hits="122"/>
+                <line number="229" hits="122"/>
+                <line number="230" hits="122"/>
               </lines>
             </method>
             <method name="parseModeNormalJson" signature="" line-rate="1" branch-rate="0" complexity="2">
               <lines>
-                <line number="214" hits="1"/>
-                <line number="215" hits="1"/>
-                <line number="216" hits="1"/>
-                <line number="217" hits="1"/>
+                <line number="236" hits="1"/>
+                <line number="237" hits="1"/>
+                <line number="238" hits="1"/>
+                <line number="239" hits="1"/>
               </lines>
             </method>
             <method name="getPaperContainer" signature="" line-rate="1" branch-rate="0" complexity="1">
               <lines>
-                <line number="226" hits="67"/>
+                <line number="248" hits="67"/>
               </lines>
             </method>
             <method name="setPaperContainer" signature="$paperContainer" line-rate="1" branch-rate="0" complexity="1">
               <lines>
-                <line number="234" hits="125"/>
+                <line number="256" hits="125"/>
               </lines>
             </method>
             <method name="setPaperRepository" signature="$repository" line-rate="1" branch-rate="0" complexity="1">
               <lines>
-                <line number="242" hits="123"/>
+                <line number="264" hits="123"/>
               </lines>
             </method>
             <method name="getPaperRepository" signature="" line-rate="1" branch-rate="0" complexity="1">
               <lines>
-                <line number="250" hits="67"/>
+                <line number="272" hits="67"/>
               </lines>
             </method>
           </methods>
@@ -6194,10 +6208,10 @@
             <line number="119" hits="0"/>
             <line number="125" hits="67"/>
             <line number="126" hits="67"/>
-            <line number="128" hits="67"/>
-            <line number="130" hits="67"/>
-            <line number="133" hits="66"/>
-            <line number="135" hits="66"/>
+            <line number="127" hits="67"/>
+            <line number="129" hits="67"/>
+            <line number="131" hits="67"/>
+            <line number="134" hits="66"/>
             <line number="136" hits="66"/>
             <line number="137" hits="66"/>
             <line number="138" hits="66"/>
@@ -6206,46 +6220,60 @@
             <line number="141" hits="66"/>
             <line number="142" hits="66"/>
             <line number="143" hits="66"/>
-            <line number="148" hits="0"/>
+            <line number="144" hits="66"/>
+            <line number="153" hits="0"/>
             <line number="154" hits="0"/>
-            <line number="159" hits="8"/>
-            <line number="161" hits="8"/>
-            <line number="163" hits="8"/>
-            <line number="164" hits="1"/>
-            <line number="166" hits="1"/>
-            <line number="168" hits="1"/>
-            <line number="169" hits="1"/>
-            <line number="171" hits="1"/>
-            <line number="172" hits="1"/>
-            <line number="175" hits="1"/>
-            <line number="176" hits="1"/>
-            <line number="177" hits="1"/>
-            <line number="178" hits="1"/>
-            <line number="179" hits="1"/>
-            <line number="180" hits="1"/>
-            <line number="181" hits="1"/>
-            <line number="182" hits="1"/>
-            <line number="183" hits="1"/>
-            <line number="184" hits="1"/>
-            <line number="185" hits="1"/>
+            <line number="155" hits="0"/>
+            <line number="157" hits="0"/>
+            <line number="159" hits="0"/>
+            <line number="162" hits="0"/>
+            <line number="164" hits="0"/>
+            <line number="165" hits="0"/>
+            <line number="166" hits="0"/>
+            <line number="167" hits="0"/>
+            <line number="168" hits="0"/>
+            <line number="169" hits="0"/>
+            <line number="170" hits="0"/>
+            <line number="171" hits="0"/>
+            <line number="172" hits="0"/>
+            <line number="181" hits="8"/>
+            <line number="183" hits="8"/>
+            <line number="185" hits="8"/>
             <line number="186" hits="1"/>
+            <line number="188" hits="1"/>
             <line number="190" hits="1"/>
-            <line number="191" hits="8"/>
-            <line number="193" hits="8"/>
-            <line number="195" hits="8"/>
-            <line number="200" hits="0"/>
-            <line number="205" hits="126"/>
-            <line number="206" hits="122"/>
-            <line number="207" hits="122"/>
-            <line number="208" hits="122"/>
-            <line number="214" hits="1"/>
-            <line number="215" hits="1"/>
-            <line number="216" hits="1"/>
-            <line number="217" hits="1"/>
-            <line number="226" hits="67"/>
-            <line number="234" hits="125"/>
-            <line number="242" hits="123"/>
-            <line number="250" hits="67"/>
+            <line number="191" hits="1"/>
+            <line number="193" hits="1"/>
+            <line number="194" hits="1"/>
+            <line number="197" hits="1"/>
+            <line number="198" hits="1"/>
+            <line number="199" hits="1"/>
+            <line number="200" hits="1"/>
+            <line number="201" hits="1"/>
+            <line number="202" hits="1"/>
+            <line number="203" hits="1"/>
+            <line number="204" hits="1"/>
+            <line number="205" hits="1"/>
+            <line number="206" hits="1"/>
+            <line number="207" hits="1"/>
+            <line number="208" hits="1"/>
+            <line number="212" hits="1"/>
+            <line number="213" hits="8"/>
+            <line number="215" hits="8"/>
+            <line number="217" hits="8"/>
+            <line number="222" hits="0"/>
+            <line number="227" hits="126"/>
+            <line number="228" hits="122"/>
+            <line number="229" hits="122"/>
+            <line number="230" hits="122"/>
+            <line number="236" hits="1"/>
+            <line number="237" hits="1"/>
+            <line number="238" hits="1"/>
+            <line number="239" hits="1"/>
+            <line number="248" hits="67"/>
+            <line number="256" hits="125"/>
+            <line number="264" hits="123"/>
+            <line number="272" hits="67"/>
           </lines>
         </class>
       </classes>
@@ -7784,7 +7812,7 @@
             </method>
             <method name="setContainer" signature="$container" line-rate="1" branch-rate="0" complexity="1">
               <lines>
-                <line number="89" hits="8"/>
+                <line number="89" hits="70"/>
               </lines>
             </method>
             <method name="getOptions" signature="" line-rate="1" branch-rate="0" complexity="1">
@@ -7876,7 +7904,7 @@
             <line number="68" hits="0"/>
             <line number="73" hits="0"/>
             <line number="81" hits="0"/>
-            <line number="89" hits="8"/>
+            <line number="89" hits="70"/>
             <line number="97" hits="121"/>
             <line number="102" hits="117"/>
             <line number="107" hits="118"/>
diff --git a/src/Option/Parser/Select.php b/src/Option/Parser/Select.php
index accdb31..53e8280 100644
--- a/src/Option/Parser/Select.php
+++ b/src/Option/Parser/Select.php
@@ -122,6 +122,7 @@ class Select extends Base
 
     private function parseModePapierDbXML()
     {
+        $this->element->setContainer((string) $this->node['container']);
         if ($this->getPaperRepository()) {
             $this->element->setNewPaperObject($this->getPaperRepository()->getNewObject());
             /** @var PaperContainer\Container $container */
@@ -144,14 +145,35 @@ class Select extends Base
                     }
                 }
             }
-        } else {
-            $this->element->setContainer((string) $this->node['container']);
         }
     }
 
     private function parseModePapierDbJson()
     {
         $this->element->setContainer((string) $this->json['container']);
+        if ($this->getPaperRepository()) {
+            $this->element->setNewPaperObject($this->getPaperRepository()->getNewObject());
+            /** @var PaperContainer\Container $container */
+            $container = $this->getPaperContainer()->getContainerById((string) $this->json['container']);
+
+            if ($container) {
+                /** @var PaperContainer\Item $papier */
+
+                foreach ($container->getItems() as $papier) {
+                    /** @var Paper $paper */
+                    $paper = $this->getPaperRepository()->findOneBy(['artNr' => $papier->getId()]);
+                    if ($paper) {
+                        $optPapier = new \PSC\Library\Calc\Option\Type\Select\PaperOpt();
+                        $optPapier->setId($paper->getArtNr());
+                        $optPapier->setLabel($paper->getDescription1());
+                        $optPapier->setPaper($paper);
+                        $optPapier->setValue($papier->getValue());
+                        $optPapier->setEdgesCollectionContainer($papier->getEdgesCollectionContainer());
+                        $this->element->addOption($optPapier);
+                    }
+                }
+            }
+        }
     }
 
     private function parseModeColorDbXML(): void