diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs
index b04310a29..1afe3a89e 100644
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -457,6 +457,11 @@ namespace BeWo
 					{
 						AppSettings.ShowKlientenBetreuungszeiten = true;
 					}
+					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.FilterGroupServiceCategories);
+					if (val != null && val.Equals("0"))
+					{
+						AppSettings.FilterGroupServiceCategories = false;
+					}
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowInfoButtonInCalender);
 					if (val != null && val.Equals("1"))
 					{
diff --git a/BeWo/Core/Config/AppSettings.cs b/BeWo/Core/Config/AppSettings.cs
index aeb8c55a6..384fd8106 100644
--- a/BeWo/Core/Config/AppSettings.cs
+++ b/BeWo/Core/Config/AppSettings.cs
@@ -26,7 +26,8 @@ namespace BeWo.Core.Config
 
         private bool _showExpiredSupportConcepts = true;
         private bool _showServiceRecordGridControl;
-        
+        private bool _filterGroupServiceCategories = true;
+
         private WindowStateType mWindowStateType = WindowStateType.Default;
 
         private ServiceRecordTimeInterval mLastSelectedServiceRecordTimeInterval = ServiceRecordTimeInterval.All;
@@ -462,5 +463,12 @@ namespace BeWo.Core.Config
         }
 
         public bool ShowKlientenBetreuungszeiten { get; set; }
+
+        public bool FilterGroupServiceCategories
+        {
+            get { return _filterGroupServiceCategories; }
+
+            set { _filterGroupServiceCategories = value; }
+        }
     }
 }
\ No newline at end of file
diff --git a/BeWo/View/Controls/MultiSupportConceptSelectionControl.xaml.cs b/BeWo/View/Controls/MultiSupportConceptSelectionControl.xaml.cs
index d6b13e9e7..7cb7c01f1 100644
--- a/BeWo/View/Controls/MultiSupportConceptSelectionControl.xaml.cs
+++ b/BeWo/View/Controls/MultiSupportConceptSelectionControl.xaml.cs
@@ -62,6 +62,8 @@ namespace BeWo.View.Controls
 
         public event EventHandler<EventArgs<CompactSupportConceptDC>> ItemSelected;
 
+        public event EventHandler<EventArgs<IList<CompactSupportConceptDC>>> ListChanged;
+
         public CompactSupportConceptDC SelectedItem
         {
             get
@@ -94,6 +96,8 @@ namespace BeWo.View.Controls
                 this.SelectedSupportConcepts.Add(e.Data);
 
                 this.listBoxSupportConcepts.ScrollIntoView(e.Data);
+
+                FireListChangedEvent();
             }
         }
 
@@ -116,6 +120,7 @@ namespace BeWo.View.Controls
                                                            this.SelectedSupportConcepts.Add(sc);
                                                        }
                                                    }
+                                                   FireListChangedEvent();
                                                }
 
                                            }));
@@ -166,6 +171,15 @@ namespace BeWo.View.Controls
             if (dc != null)
             {
                 this.SelectedSupportConcepts.Remove(dc);
+                FireListChangedEvent();
+            }
+        }
+
+        private void FireListChangedEvent()
+        {
+            if (ListChanged != null)
+            {
+                ListChanged(this, new EventArgs<IList<CompactSupportConceptDC>>(SelectedSupportConcepts)); 
             }
         }
 
diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordGroupEditView.xaml b/BeWo/View/Detail/Zeiterfassung/ServiceRecordGroupEditView.xaml
index e7536b596..f78464cf4 100644
--- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordGroupEditView.xaml
+++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordGroupEditView.xaml
@@ -84,6 +84,11 @@
                                     <RowDefinition Height="Auto" />
                                     <RowDefinition Height="Auto" />
                                 </Grid.RowDefinitions>
+                                <Label Grid.Column="0" Grid.Row="1" Content="Ziele" Visibility="{Binding Path=IsGoalTreeVisible, Converter={StaticResource BoolVisibilityConverter}}" />
+                                <localViewControls:ComboBoxTreeViewControl Grid.Column="1" Grid.Row="1" Margin="0" 
+                                                                           x:Name="ComboBoxTreeViewControl" 
+                                                                           TreeViewSourceList="{Binding Path=GoalTree, Mode=TwoWay}" 
+                                                                           Visibility="{Binding Path=IsGoalTreeVisible, Converter={StaticResource BoolVisibilityConverter}}" SelectOnlyLeafs="False" ShowRatingPanel="True"/>
                                 <!--<Label Grid.Column="0" Grid.Row="1" Content="Ziele" Visibility="{Binding Path=IsGoalTreeVisible, Converter={StaticResource BoolVisibilityConverter}}" />
                                 <TreeView x:Name="treeview_Goals" Grid.Column="1"  Grid.Row="1" Margin="3,0,3,3" ItemsSource="{Binding Path=GoalTree}" Visibility="{Binding Path=IsGoalTreeVisible, Converter={StaticResource BoolVisibilityConverter}}" ItemContainerStyle="{DynamicResource goal_treeitemstyle}" ItemTemplate="{DynamicResource goal_treeitemtemplate}" Grid.RowSpan="1" MinHeight="24" MaxHeight="100"  >
                                     <TreeView.Resources>
diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordGroupEditView.xaml.cs b/BeWo/View/Detail/Zeiterfassung/ServiceRecordGroupEditView.xaml.cs
index 998ce5fec..db66caa86 100644
--- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordGroupEditView.xaml.cs
+++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordGroupEditView.xaml.cs
@@ -99,6 +99,13 @@ namespace BeWo.View.Detail.Zeiterfassung
         private void loaded(object sender, RoutedEventArgs e)
         {
             var x = ActualWidth;
+
+            if (ActualHeight > 0)
+            {
+                ComboBoxTreeViewControl.ParentWindowHeight = ActualHeight;
+            }
+
+            ComboBoxTreeViewControl.Imitationheader.Width = 196;
         }
 
         public override bool CanDelete
@@ -200,7 +207,7 @@ namespace BeWo.View.Detail.Zeiterfassung
             
 
 
-            InitSelectionList();
+            InitSelectionAndGoalList();
             ConfigureServiceRecordFormats(pSelectedViewModel.ServiceRecordFormat,pSelectedViewModel.DauerEinheit);
 
             if (!pSelectedViewModel.EditAllowed)
@@ -223,8 +230,10 @@ namespace BeWo.View.Detail.Zeiterfassung
             {
                 _TextModuleButtonList.DoForEach(button => button.Visibility = Visibility.Collapsed);
             }
+
+            
         }
-        
+
 
         public bool IsCustomerChangeAllowed()
         {
@@ -390,7 +399,7 @@ namespace BeWo.View.Detail.Zeiterfassung
             SaveWithCallback(null);    
         }
 
-        private void InitSelectionList()
+        private void InitSelectionAndGoalList()
         {
             if (_Group == null) 
                 return;
@@ -406,6 +415,11 @@ namespace BeWo.View.Detail.Zeiterfassung
                 if (!multiSupportConceptControl.SelectedSupportConcepts.Contains(item.SupportConcept))
                     multiSupportConceptControl.SelectedSupportConcepts.Add(item.SupportConcept);
             }
+
+            _ViewModel.UpdateGroupServiceAccountings(multiSupportConceptControl.SelectedSupportConcepts);
+
+            ComboBoxTreeViewControl.TreeViewSourceList = _ServiceRecordVM.GoalTree;
+            ComboBoxTreeViewControl.Visibility = (_ServiceRecordVM.IsGoalTreeVisible) ? Visibility.Visible : Visibility.Collapsed;
         }
 
 	    private bool IsSupportConceptOrEmployeeChanged()
@@ -1167,6 +1181,8 @@ namespace BeWo.View.Detail.Zeiterfassung
                 item.GroupOid = dc.GroupOid;
                 item.GroupRoundedDuration = groupDuration;
 
+                item.Goals = dc.Goals;
+
                 var i1 = item.CostBearer;
                 var i2 = item.CostBearer.CostBearerOid;
                 var i3 = item.SupportConcept;
diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml
index cb5274203..6cce464ee 100644
--- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml
+++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml
@@ -378,7 +378,7 @@
                                         HorizontalContentAlignment="Stretch" />
                                 <localViewControls:MultiSupportConceptSelectionControl Grid.Column="0" Margin="0,3,0,0"
                                         x:Name="multiSupportConceptControl" MinHeight="100" MaxHeight="200"
-                                        Visibility="Collapsed" ItemSelected="MultiSupportConceptControl_ItemSelected" VerticalAlignment="Top" />
+                                        Visibility="Collapsed" ItemSelected="MultiSupportConceptControl_ItemSelected" ListChanged="multiSupportConceptControl_ListChanged" VerticalAlignment="Top" />
                                 <localViewControls:MultiEmployeeSelectionControl Grid.Column="1" Margin="5,3,0,0"
                                         x:Name="multiEmployeeControl" Width="250" MinHeight="100" MaxHeight="200" VerticalAlignment="Top"
                                         Visibility="Collapsed" />
diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs
index c23b66547..9903b01f6 100644
--- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs
+++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs
@@ -2286,8 +2286,8 @@ namespace BeWo.View.Detail.Zeiterfassung
             ButtonZeiterfassungErstellen.Visibility = Visibility.Collapsed;
             multiSupportConceptControl.Visibility = Visibility.Visible;
             multiEmployeeControl.Visibility = Visibility.Visible;
-            panelGoalLabel.Visibility = Visibility.Collapsed;
-            panelGoalTree.Visibility = Visibility.Collapsed;
+            //panelGoalLabel.Visibility = Visibility.Collapsed;
+            //panelGoalTree.Visibility = Visibility.Collapsed;
 
             SetEmployeeComboVisibility();
 
@@ -2325,8 +2325,8 @@ namespace BeWo.View.Detail.Zeiterfassung
             ButtonZeiterfassungErstellen.Visibility = BeWoApp.AppSettings.ShowKlientenBetreuungszeiten ? Visibility.Visible : Visibility.Collapsed;
             multiSupportConceptControl.Visibility = Visibility.Collapsed;
             multiEmployeeControl.Visibility = Visibility.Collapsed;
-            panelGoalLabel.Visibility = Visibility.Visible;
-            panelGoalTree.Visibility = Visibility.Visible;
+            //panelGoalLabel.Visibility = Visibility.Visible;
+            //panelGoalTree.Visibility = Visibility.Visible;
 
             SetEmployeeComboVisibility();
             SetRebookingButtonVisibility();
@@ -5009,6 +5009,17 @@ namespace BeWo.View.Detail.Zeiterfassung
 
             BeWoUtils.NavigateToReportUri(url, "Druckvorschau");
         }
+
+        private void multiSupportConceptControl_ListChanged(object sender, EventArgs<IList<CompactSupportConceptDC>> e)
+        {
+            ViewModel.UpdateGroupServiceAccountings(e.Data);
+            ComboBoxTreeViewControl.ResetControl();
+
+            ResetAllGoals(ViewModel.PrototypeVM.GoalTree);
+
+
+            ComboBoxTreeViewControl.TreeViewSourceList = ViewModel.PrototypeVM.GoalTree;
+        }
     }
 
     //public class RowBackgroundHelper
diff --git a/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs b/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs
index abd0c4716..16a0eae46 100644
--- a/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs
@@ -1678,5 +1678,120 @@ namespace BeWo.ViewModel.ListViewModel
             }
 
         }
+
+        internal void UpdateGroupServiceAccountings(IList<CompactSupportConceptDC> data)
+        {
+            if (data != null)
+            {
+                var allInfos = new List<SupportConceptTreeNodeDetailInfoDC>();
+
+                foreach (var item in data)
+                {
+                    var infoDC = ServiceFacade.DoOperationsServiceSync(s => s.GetSupportConceptTreeNodeDetailInfo(0, item.SupportConceptOid, null));
+
+                    if (infoDC != null)
+                    {
+                        allInfos.Add(infoDC);
+                        
+                    }
+                }
+
+                
+                UpdateGruppenZiele(allInfos);
+
+                if (BeWoApp.AppSettings.FilterGroupServiceCategories)
+                {
+                    var serviceAccountings = ErstelleServiceCategorySchnittmenge(allInfos);
+                    PrototypeVM.UpdateServiceAccountings(serviceAccountings, _Category2Services, false);
+                }
+
+                
+                
+                
+            }
+        }
+
+        private void UpdateGruppenZiele(List<SupportConceptTreeNodeDetailInfoDC> allInfos)
+        {
+            var goalCats = new List<ValueListEntryDC>();
+            var goals = new List<ValueListEntryDC>();
+
+            var goalCategoryDict = _AllGoalCategories.ToDictionary(goalCat => goalCat.ValueListEntryOid.Value);
+
+            foreach (var info in allInfos)
+            {
+                foreach (var goal in info.SupportConceptGoals)
+                {
+                    if (goal.ParentOid != null && goalCategoryDict.ContainsKey(goal.ParentOid.Value))
+                    {
+                        var path = GetAllParentGoalCategoies(goalCategoryDict, goal);
+                        foreach (var goalCat in path)
+                        {
+                            goalCats.Add(goalCat);
+                            goalCategoryDict.Remove(goalCat.ValueListEntryOid.Value);
+                        }
+                    }
+
+                    goals.Add(goal);
+                }
+            }
+            
+
+            PrototypeVM.ChangeGoalTree(goalCats, goals);
+        }
+
+
+        private List<ServiceAccountingDC> ErstelleServiceCategorySchnittmenge(List<SupportConceptTreeNodeDetailInfoDC> allInfos)
+        {
+            
+            if (allInfos.Count == 0)
+            {
+                return null;
+            }
+            else if (allInfos.Count == 1)
+            {
+                return allInfos[0].ServiceAccountings;
+            }
+
+            var schnittmenge = new List<ServiceAccountingDC>();
+
+            foreach (var info in allInfos)
+            {
+                if (info.ServiceAccountings != null && info.ServiceAccountings.Count == 0 && _Category2Services != null)
+                {
+                    foreach (var descList in _Category2Services.Values)
+                    {
+                        foreach (var desc in descList)
+                        {
+                            info.ServiceAccountings.Add(new ServiceAccountingDC { ServiceDescription = desc });
+                        }
+                    }
+                }
+            }
+
+            var erster = allInfos[0];
+
+            foreach (var sa in erster.ServiceAccountings)
+            {
+                //Prüfe für jeden des ersten ob er auch in allen anderen enthalten ist
+                bool istDrin = true;
+                for (int i = 1; i < allInfos.Count; i++)
+                {
+                    var info2 = allInfos[i];
+
+                    if (!info2.ServiceAccountings.Exists(sa2 => sa2.ServiceDescription.ServiceDescriptionOid == sa.ServiceDescription.ServiceDescriptionOid))
+                    {
+                        istDrin = false;
+                    }
+                    
+                }
+                if (istDrin)
+                {
+                    schnittmenge.Add(sa);
+                }
+            }
+            return schnittmenge;
+            
+        }
     }
 }
\ No newline at end of file
diff --git a/Service/Security/SecurityUtils.cs b/Service/Security/SecurityUtils.cs
index 21f155c33..e8cd36a31 100644
--- a/Service/Security/SecurityUtils.cs
+++ b/Service/Security/SecurityUtils.cs
@@ -184,76 +184,25 @@ namespace BeWo.Service.Security
 
 
             return info;
-            try
-		    {
-		        string url = ConfigurationManager.AppSettings.Get("LicenseInfoUrl");
-
-                //url = url.Replace("[TENANT]", MultitenancyOperationContextExt.Current.Tenant);
-
-		        var test = MultitenancyOperationContextExt.Current.Tenant;
-
-                url = url.Replace("[TENANT]", "1234567890");
-                url += "&t=0";
-		        //url = url.Replace("[TENANT]", "1441747891");
-
-		        using (WebClient client = new WebClient())
-		        {
-		            //MessageBox.Show(hostAddress);
-		            byte[] response = client.DownloadData(url);
-
-		            String result = System.Text.Encoding.ASCII.GetString(response);
-		            //if (MultitenancyOperationContextExt.Current.Tenant == "demo")
-		            //{
-		            //	result = "7;30";
-		            //}
-		            String[] resultArray = result.Split(';');
-
-		            int maxLicenses = 0;
-                    int midLicenses = 0;
-                    decimal percentFreeEmployees = 0;
-		            if (resultArray.Length > 0)
-		            {
-		                Int32.TryParse(resultArray[0], out maxLicenses);
-		                if (resultArray.Length > 1)
-		                {
-		                    Decimal.TryParse(resultArray[1], out percentFreeEmployees);
-		                }
-                        if (resultArray.Length > 2)
-                        {
-                            Int32.TryParse(resultArray[2], out midLicenses);
-                        }
-                    }
-                    if (midLicenses > 0)
-                    {
-                        percentFreeEmployees = 0;
-                        maxLicenses += midLicenses;
-                    }
-		            info.MaxLicenseCount = 1000;
-		            info.PercentFreeEmployee = percentFreeEmployees;
-
-		            info.LicenseInUseCount = DAOFactory.GenericDAO.GetAllActive<ApplicationUser>().Count;
-		            info.EmployeeCount = DAOFactory.GenericDAO.GetAllActive<Employee>().Count;
-
-		            info.MaxEmployeeCount = (int)Math.Ceiling(maxLicenses * ((100 + percentFreeEmployees) / 100));
-		        }
-		    }
-		    catch (Exception)
-		    {
-		        //
-		    }
-		    return info;
 
 #endif
 
-			try
+            try
 			{
-				string url = ConfigurationManager.AppSettings.Get("LicenseInfoUrl");
+                string url = ConfigurationManager.AppSettings.Get("LicenseInfoUrl");
 
-				url = url.Replace("[TENANT]", MultitenancyOperationContextExt.Current.Tenant);
-			    url += "&t=0";
-				//url = url.Replace("[TENANT]", "1441747891");
+                url = url.Replace("[TENANT]", MultitenancyOperationContextExt.Current.Tenant);
+                url += "&t=0";
 
-				using (WebClient client = new WebClient())
+#if DEBUG
+                url = ConfigurationManager.AppSettings.Get("LicenseInfoUrl");
+
+                url = url.Replace("[TENANT]", "3522103738");
+                url += "&t=0";
+#endif
+                //url = url.Replace("[TENANT]", "1441747891");
+
+                using (WebClient client = new WebClient())
 				{
 					//MessageBox.Show(hostAddress);
 					byte[] response = client.DownloadData(url);
diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs
index 0652051e3..c1698dd21 100644
--- a/Service/ServiceImplementations/OperationsServiceImp.cs
+++ b/Service/ServiceImplementations/OperationsServiceImp.cs
@@ -1278,10 +1278,12 @@ namespace BeWo.Service.ServiceImplementations
             {
                 var dc = new SupportConceptTreeNodeDetailInfoDC();
 
-                var customer = DAOFactory.GenericDAO.LoadByID<Customer>(pCustomerOid);
-
-                dc.CustomerAbsenceTimes = MapperFactory.AbsenceTimeDC_AbsenceTime.MapToNewDCs(customer.AbsenceTimes);
+                if (pCustomerOid > 0)
+                {
+                    var customer = DAOFactory.GenericDAO.LoadByID<Customer>(pCustomerOid);
 
+                    dc.CustomerAbsenceTimes = MapperFactory.AbsenceTimeDC_AbsenceTime.MapToNewDCs(customer.AbsenceTimes);
+                }
                 if (pSupportConceptOid != null)
                 {
                     var sc = DAOFactory.GenericDAO.LoadByID<SupportConcept>(pSupportConceptOid.Value);
diff --git a/Shared/Core/SettingsKeys.cs b/Shared/Core/SettingsKeys.cs
index d76147ec4..c598f79fc 100644
--- a/Shared/Core/SettingsKeys.cs
+++ b/Shared/Core/SettingsKeys.cs
@@ -81,5 +81,8 @@
         public static string ShowHilfeplanStatistikReport              => "ShowHilfeplanStatistikReport";
 
         public static string MoKSessionTimeout => "MoKSessionTimeout";
+
+        public static string FilterGroupServiceCategories => "FilterGroupServiceCategories";
+        
     }
 }