diff --git a/BeWoPlanerMobil/Controllers/LoginController.cs b/BeWoPlanerMobil/Controllers/LoginController.cs
index 14baacd51..13f5c3c0f 100644
--- a/BeWoPlanerMobil/Controllers/LoginController.cs
+++ b/BeWoPlanerMobil/Controllers/LoginController.cs
@@ -54,6 +54,7 @@ namespace BeWoPlanerMobil.Controllers
 					HttpContext.Response.SetCookie(keks);
 
 					var brauser = Request.Browser;
+
 					var brauserInfoDC = new BeWoMobilBrowserInfoDC
 					{
 						Type = brauser.Type,
diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs
index 7fcecd96f..5a340ea30 100644
--- a/BeWoPlanerMobil/Controllers/MainController.cs
+++ b/BeWoPlanerMobil/Controllers/MainController.cs
@@ -157,12 +157,12 @@ namespace BeWoPlanerMobil.Controllers
                 {
                     Model.SupportConcepts = EmployeeService.GetActiveSupportConceptsForEmployee(Model.Employee.EmployeeOid, Model.SelectedSupportConceptFilter);
                 }
-                else if(!(Model?.SupportConcepts is null))
+                else //if(!(Model?.SupportConcepts is null))
                 {
                     Model.SupportConcepts = new List<SupportConceptDC>();
                 }
 
-                if(!(Model is null) && !Model.ShowExpiredSupportConcepts)
+                if((Model?.ShowExpiredSupportConcepts ?? false) == false)
                 {
                     Model.SupportConcepts = Model.SupportConcepts.Where(supportConcept =>
                     {
diff --git a/BeWoPlanerMobil/Controllers/SchedulerController.cs b/BeWoPlanerMobil/Controllers/SchedulerController.cs
index c744b1744..cd4078a75 100644
--- a/BeWoPlanerMobil/Controllers/SchedulerController.cs
+++ b/BeWoPlanerMobil/Controllers/SchedulerController.cs
@@ -143,7 +143,7 @@ namespace BeWoPlanerMobil.Controllers
                 w.StartDate.HasValue && w.EndDate.HasValue && // Datumsangaben haben einen Wert
 
                   (date.InBetween(w.StartDate.Value, w.EndDate.Value, false) || date.CompareShortDates(w.StartDate.Value))
-                // Einzeltermine oder Ausnahmen und gelöschte Ausnahmen
+                      // Einzeltermine oder Ausnahmen und gelöschte Ausnahmen
                       && (w.RecurrenceInfo is null || w.RecurrenceInfo != null && (w.Type == 3 || w.Type == 4))
 
                 ).ToList();
@@ -163,7 +163,6 @@ namespace BeWoPlanerMobil.Controllers
                 app.EndDate = app.EndDate.Value.AddMinutes(-1);
             }
 
-            // .Where(w => w.IsTask == Model.ShouldLoadTasks)
             Model.Appointments = holySweetFlyingFuck.Where(w => w.IsTask == Model.ShouldLoadTasks).OrderBy(appointment => appointment.StartDate).ToList();
 
             Model.WeekViewObject = new WeekViewObject(Model.Appointments, Model.SelectedDate.GetInSameCalendarWeek(DayOfWeek.Monday));
diff --git a/BeWoPlanerMobil/Models/MainModel.cs b/BeWoPlanerMobil/Models/MainModel.cs
index 8a32a47b5..e056d3154 100644
--- a/BeWoPlanerMobil/Models/MainModel.cs
+++ b/BeWoPlanerMobil/Models/MainModel.cs
@@ -287,7 +287,7 @@ namespace BeWoPlanerMobil.Models
 
         public SupportConceptListObject SelectedSupportConceptListObject { get; set; }
 
-	    public List<SupportConceptCostBearerRelDC> SelectedConceptCostBearerRelations { get; set; }
+        public List<SupportConceptCostBearerRelDC> SelectedConceptCostBearerRelations { get; set; } = new List<SupportConceptCostBearerRelDC>();
 
         public GroupBookingSelectionObject GroupBookingSelectionObject => new GroupBookingSelectionObject(SelectedConceptCostBearerRelations, GroupBookingSelectedGroupOfPeopleOids);
 
@@ -676,7 +676,7 @@ namespace BeWoPlanerMobil.Models
 
         public List<long> MultiBookingSelectedGroupOfPeopleOids { get; set; } = new List<long>();
 
-        public List<SupportConceptCostBearerRelDC> MultiBookingSelectedConceptCostBearerRelations { get; set; }
+        public List<SupportConceptCostBearerRelDC> MultiBookingSelectedConceptCostBearerRelations { get; set; } = new List<SupportConceptCostBearerRelDC>();
 
         public GroupBookingSelectionObject MultiBookingSelectionObject => new GroupBookingSelectionObject(MultiBookingSelectedConceptCostBearerRelations, MultiBookingSelectedGroupOfPeopleOids);
 
diff --git a/BeWoPlanerMobil/Views/Main/Main.cshtml b/BeWoPlanerMobil/Views/Main/Main.cshtml
index 5e63107d1..dc9ce90bb 100644
--- a/BeWoPlanerMobil/Views/Main/Main.cshtml
+++ b/BeWoPlanerMobil/Views/Main/Main.cshtml
@@ -15,6 +15,10 @@
     }
 }
 
+<!--
+ToDo: Main.cshtml und Index.cshtml mit eingecheckter Version vergleichen! Irgendetwas stimmt nicht!    
+-->
+
 <script>
     function textModuleOnClick(textModuleOid) {
         var focusedDokuFeld;
@@ -173,7 +177,7 @@
                 "#distance, #textbausteine-button, #goals-button, textarea, #reset-button, " +
                 "#create-button, #statistics-button, #timeFrameSelect, #hours-minutes-dropdown-btn").prop("disabled", (isSupportConceptSelected ? false : true));
 
-            if(getIsInGroupBookingMode()) {
+            if("@Model.IsInGroupBookingMode".toLowerCase() === "true") {
                 var hasSelectedSupportConcepts = "@Model.SelectedConceptCostBearerRelations.Any()".toLowerCase() === "true";
 
                 $("#employees-button, #category-select, #leistung-select, " +
diff --git a/Data/Mappings/ServiceCategory.hbm.xml b/Data/Mappings/ServiceCategory.hbm.xml
index 6aba239e2..183d0f86f 100644
--- a/Data/Mappings/ServiceCategory.hbm.xml
+++ b/Data/Mappings/ServiceCategory.hbm.xml
@@ -10,8 +10,8 @@
         <property column="Name" type="string" name="Name" />
         <property column="Abbreviation" type="String" name="Abbreviation" length="16" />
         <property column="Percentage" type="System.Decimal" name="ProzentAbrechnung" />
-		<property column="ProzentBudget" type="System.Decimal" name="ProzentBudget" />
-		<property column="ProzentStundenkonto" type="System.Decimal" name="ProzentStundenkonto" />
+		    <property column="ProzentBudget" type="System.Decimal" name="ProzentBudget" />
+		    <property column="ProzentStundenkonto" type="System.Decimal" name="ProzentStundenkonto" />
         <property column="Billable" type="Boolean" name="IsBillable" />
         <property column="nurOhneHilfeplan" type="BS.Shared.AccountingvisibilityType, BS.Shared" name="OhneHilfeplan" />     
         <property column="Notice" type="String" name="Notice" length="1024" />