diff --git a/ENI2/DetailViewControls/WasteDetailControl.xaml.cs b/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
index 3723b3d9..2850e023 100644
--- a/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
@@ -170,6 +170,12 @@ namespace ENI2.DetailViewControls
             this.dataGridWasteReceived.DeleteRequested += DataGridWasteReceived_DeleteRequested;
             this.dataGridWasteReceived.CreateRequested += DataGridWasteReceived_CreateRequested;
 
+            if(this._wasRcptMessage.Elements.Count > 0)
+            {
+                this.dataGridWasteReceipt.SelectedItem = this._wasRcptMessage.Elements[0];
+                this.dataGridWasteReceipt_SelectionChanged(null, null);
+            }
+
             #endregion
 
         }
@@ -181,7 +187,8 @@ namespace ENI2.DetailViewControls
             EditWasteReceiptDialog epd = new EditWasteReceiptDialog();
             epd.WAS_RCPT = new WAS_RCPT();
             epd.WAS_RCPT.MessageHeader = _wasRcptMessage;
-            epd.WAS_RCPT.Identifier = WAS_RCPT.GetNewIdentifier(_wasRcptMessage.Elements);            
+            epd.WAS_RCPT.Identifier = WAS_RCPT.GetNewIdentifier(_wasRcptMessage.Elements);
+            epd.WAS_RCPT.AddMissingWasteReceived();
 
             epd.AddClicked += () =>
             {
@@ -192,6 +199,7 @@ namespace ENI2.DetailViewControls
                 epd.WAS_RCPT = new WAS_RCPT();
                 epd.WAS_RCPT.MessageHeader = _wasRcptMessage;
                 epd.WAS_RCPT.Identifier = WAS_RCPT.GetNewIdentifier(_wasRcptMessage.Elements);
+                epd.WAS_RCPT.AddMissingWasteReceived();
                 this.SublistElementChanged(Message.NotificationClass.WAS_RCPT);
             };
 
@@ -200,9 +208,10 @@ namespace ENI2.DetailViewControls
                 if (!this._wasRcptMessage.Elements.Contains(epd.WAS_RCPT))
                     _wasRcptMessage.Elements.Add(epd.WAS_RCPT);
                 this.dataGridWasteReceipt.Items.Refresh();
+                this.dataGridWasteReceipt.SelectedItem = epd.WAS_RCPT;
                 this.SublistElementChanged(Message.NotificationClass.WAS_RCPT);
-                this.dataGridWasteReceived.ItemsSource = null;
-                this._selectedWAS_RCPT = null;
+                this.dataGridWasteReceived.ItemsSource = null;                
+                dataGridWasteReceipt_SelectionChanged(this, null);
             }
         }
 
@@ -236,16 +245,19 @@ namespace ENI2.DetailViewControls
                 epd.WAS_RCPT = new WAS_RCPT();
                 epd.WAS_RCPT.Identifier = WAS_RCPT.GetNewIdentifier(_wasRcptMessage.Elements);
                 epd.WAS_RCPT.MessageHeader = _wasRcptMessage;
+                epd.WAS_RCPT.AddMissingWasteReceived();
                 this.SublistElementChanged(Message.NotificationClass.WAS_RCPT);
             };
 
             if (epd.ShowDialog() ?? false)
             {
                 if (!_wasRcptMessage.Elements.Contains(epd.WAS_RCPT))
-                    _wasRcptMessage.Elements.Add(epd.WAS_RCPT);                
+                    _wasRcptMessage.Elements.Add(epd.WAS_RCPT);
             }
+            this.dataGridWasteReceipt.SelectedItem = epd.WAS_RCPT;            
             this.dataGridWasteReceipt.Items.Refresh();
             this.SublistElementChanged(Message.NotificationClass.WAS_RCPT);
+            dataGridWasteReceipt_SelectionChanged(this, null);
         }
 
         private void DataGridWasteReceipt_AddingNewItem(object sender, AddingNewItemEventArgs e)
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 0efa3d38..7d567f8c 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,8 +36,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>7.0.2.1</ApplicationVersion>
+    <ApplicationRevision>3</ApplicationRevision>
+    <ApplicationVersion>7.0.2.3</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/ENI2/EditControls/EditWasteReceiptDialog.xaml b/ENI2/EditControls/EditWasteReceiptDialog.xaml
index d6ada39e..9a5e8ec3 100644
--- a/ENI2/EditControls/EditWasteReceiptDialog.xaml
+++ b/ENI2/EditControls/EditWasteReceiptDialog.xaml
@@ -41,7 +41,7 @@
         <xctk:DateTimePicker Grid.Row="4" Grid.Column="1" Name="dateTimePickerWasteDeliveryDateFrom" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00" PreviewKeyUp="DateTimePicker_PreviewKeyUp"/>
         <xctk:DateTimePicker Grid.Row="5" Grid.Column="1" Name="dateTimePickerWasteDeliveryDateTo" Format="Custom" FormatString="dd.MM.yyyy HH:mm" ShowButtonSpinner="False" VerticalContentAlignment="Center" Margin="2" AllowTextInput="True" ContextMenu="{DynamicResource ClearContextMenu}" TextAlignment="Left" Minimum="1899.12.31 00:00" Maximum="2100.12.31 00:00" PreviewKeyUp="DateTimePicker_PreviewKeyUp"/>
 
-        <Button x:Name="buttonAddEntries" Grid.Column="1" Grid.Row="7" Margin="2" Click="buttonAddEntries_Click" Width="170" Content="Add waste received entries" HorizontalAlignment="Left"/>
+        <!--Button x:Name="buttonAddEntries" Grid.Column="1" Grid.Row="7" Margin="2" Click="buttonAddEntries_Click" Width="170" Content="Add waste received entries" HorizontalAlignment="Left"/-->
 
     </Grid>
 </enictrl:EditWindowBase>
diff --git a/ENI2/EditControls/EditWasteReceiptDialog.xaml.cs b/ENI2/EditControls/EditWasteReceiptDialog.xaml.cs
index 10c78e26..b0c994ce 100644
--- a/ENI2/EditControls/EditWasteReceiptDialog.xaml.cs
+++ b/ENI2/EditControls/EditWasteReceiptDialog.xaml.cs
@@ -52,9 +52,10 @@ namespace ENI2.EditControls
             this.CopyValuesToEntity();
         }
 
-        private void buttonAddEntries_Click(object sender, RoutedEventArgs e)
-        {
-            this.WAS_RCPT.AddMissingWasteReceived();
-        }
+        
+        // private void buttonAddEntries_Click(object sender, RoutedEventArgs e)
+        // {
+        //    this.WAS_RCPT.AddMissingWasteReceived();
+        // }
     }
 }