diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs
index d4ea871ac..cc8f0ff8e 100644
--- a/BeWoPlanerMobil/Controllers/MainController.cs
+++ b/BeWoPlanerMobil/Controllers/MainController.cs
@@ -188,7 +188,7 @@ namespace BeWoPlanerMobil.Controllers
 
                 if(Model.EmployeesForGroupAndMultiBooking is null)
                 {
-                    Model.EmployeesForGroupAndMultiBooking = EmployeeService.GetAllCompactEmployees().OrderBy(e => e.LastName).ToList();
+                    Model.EmployeesForGroupAndMultiBooking = EmployeeService.GetAllCompactEmployees().Where(e => e.ActivationType == ActivationTypeId.Active).OrderBy(e => e.LastName).ToList();
                 }
 
                 if (MobileSessionFacade.CheckForUserRight(UserRightType.ServiceRecord_AllowCreationForOtherEmployees))
@@ -197,7 +197,7 @@ namespace BeWoPlanerMobil.Controllers
                 }
                 else if(MobileSessionFacade.CheckForUserRight(UserRightType.ServiceRecord_AllowCreationForOtherTeamMember) && Model.Employee?.EmployeeOid != null)
                 {
-                    Model.Employees = EmployeeService.GetAllTeamMember(MobileSessionFacade.LoggedInCompactEmployee);
+                    Model.Employees = EmployeeService.GetAllTeamMember(MobileSessionFacade.LoggedInCompactEmployee).Where(e => e.ActivationType == ActivationTypeId.Active).ToList();
                 }
                 else
                 {
diff --git a/BeWoPlanerMobil/Controllers/ReportViewerController.cs b/BeWoPlanerMobil/Controllers/ReportViewerController.cs
index b7668767e..3eb397bea 100644
--- a/BeWoPlanerMobil/Controllers/ReportViewerController.cs
+++ b/BeWoPlanerMobil/Controllers/ReportViewerController.cs
@@ -99,6 +99,14 @@ namespace BeWoPlanerMobil.Controllers
 
             Model.Queries = QueryService.GetAllQueriesOfType(QueryType.Public);
 
+            foreach(var query in Model.Queries.Where(q => q.Parameter?.Any() ?? false))
+            {
+                foreach(var parameter in query.Parameter.Where(p => p.ParamType == QueryParameterType.ValueListEntryType))
+                {
+                    // ToDo: Hier am 05.08.2024 weitermachen!
+                }
+            }
+
             if(Model.Employee?.EmployeeOid.HasValue ?? false)
             {
                 Model.SupportConcepts = EmployeeService.GetActiveSupportConceptsForEmployee(Model.Employee.EmployeeOid, CustomerFilterEnum.All);
diff --git a/BeWoPlanerMobil/Models/ReportViewerModel.cs b/BeWoPlanerMobil/Models/ReportViewerModel.cs
index 2e5e56e05..598f1829a 100644
--- a/BeWoPlanerMobil/Models/ReportViewerModel.cs
+++ b/BeWoPlanerMobil/Models/ReportViewerModel.cs
@@ -195,7 +195,7 @@ namespace BeWoPlanerMobil.Models
 
         public Dictionary<long, SelectedValue> SelectedValues { get; set; } = new Dictionary<long, SelectedValue>();
 
-
+        public Dictionary<ValueListEntryType, List<ValueListEntryDC>> ValueListEntryTypes2ValueListEntries { get; set; } = new Dictionary<ValueListEntryType, List<ValueListEntryDC>>();
 
         public List<SupportConceptCostBearerRelDC> CostBearer2SupportConceptRels { get; set; } = new List<SupportConceptCostBearerRelDC>();
     }
diff --git a/BeWoPlanerMobil/Views/Main/GoalTreePartial.cshtml b/BeWoPlanerMobil/Views/Main/GoalTreePartial.cshtml
index d5a3a1e2b..60602ae11 100644
--- a/BeWoPlanerMobil/Views/Main/GoalTreePartial.cshtml
+++ b/BeWoPlanerMobil/Views/Main/GoalTreePartial.cshtml
@@ -165,10 +165,10 @@
                     <div class="custom-control custom-checkbox goal-card-header float-left" onclick="stopToggle(event)" >
                         <input type="checkbox" class="custom-control-input goal-input" value="@goalTreeItem.ValueListEntryOid" @isCheckedValue id="goal-cb-@goalTreeItem.ValueListEntryOid" onchange="updateSelectedGoals()" />
                         <label class="custom-control-label goal-name-label @textClass" for="goal-cb-@goalTreeItem.ValueListEntryOid">@goalTreeItem.Header</label>
-                        @if(AbstractModel.HasRightToRateGoals && ratingType != null)
+                        @if(AbstractModel.HasRightToRateGoals)
                         {
                             <span style="cursor: pointer;" id="goal-rating-@goalTreeItem.ValueListEntryOid" class="badge badge-bewo-goal-rating goal-rating-badge ml-1" onclick="showGoalRatingPopup(@goalTreeItem.ValueListEntryOid)">
-                                @(ratingType.DisplayName ?? goalTreeItem.RatingName)
+                                @(ratingType?.DisplayName ?? goalTreeItem.RatingName)
                             </span>
                         }
                     </div>
@@ -194,10 +194,10 @@
         <div class="custom-control custom-checkbox goal-text @marginBottom">
             <input type="checkbox" class="custom-control-input goal-input" id="goal-cb-@goalTreeItem.ValueListEntryOid" @isCheckedValue onchange="updateSelectedGoals()">
             <label for="goal-cb-@goalTreeItem.ValueListEntryOid" class="custom-control-label goal-name-label @textClass">@goalTreeItem.Header</label>
-            @if(AbstractModel.HasRightToRateGoals && ratingType != null)
+            @if(AbstractModel.HasRightToRateGoals)
             {
                 <span id="goal-rating-@goalTreeItem.ValueListEntryOid" style="cursor: pointer;" class="badge badge-bewo-goal-rating goal-rating-badge ml-1" onclick="showGoalRatingPopup(@goalTreeItem.ValueListEntryOid)">
-                    @(ratingType.DisplayName ?? goalTreeItem.RatingName)
+                    @(ratingType?.DisplayName ?? goalTreeItem.RatingName)
                 </span>
             }
         </div>