diff --git a/Data/Access/SearchDAO.cs b/Data/Access/SearchDAO.cs
index 5cf407459..696604539 100644
--- a/Data/Access/SearchDAO.cs
+++ b/Data/Access/SearchDAO.cs
@@ -1560,7 +1560,7 @@ namespace BeWo.Data.Access
 
         public IEnumerable<TextModule> GetActiveTextModuleByServiceCategory(long pServiceCategoryOid)
         {
-            var c = CreateCriteriaIsActive<TextModule>();
+            var c = CreateCriteria<TextModule>();
 
             c.Add(Restrictions.Or(Restrictions.Eq(TextModule.PropertyName_ServiceCategory + ".Oid", pServiceCategoryOid), Restrictions.IsNull(TextModule.PropertyName_ServiceCategory)));
 
@@ -2380,7 +2380,7 @@ namespace BeWo.Data.Access
 
 	    public IEnumerable<TextModule> GetActiveTextModules(bool pShouldOnlyLoadOwnTextModules, bool pHasRightToSeeAll, bool pIsInAdministrationView, long pEmployeeOid)
 	    {
-		    var criteria = CreateCriteriaIsActive<TextModule>();
+		    var criteria = CreateCriteria<TextModule>();
 
 	        if(pIsInAdministrationView)
 	        {
@@ -2406,7 +2406,7 @@ namespace BeWo.Data.Access
 
         public IEnumerable<TextModule> GetChildTextModules(TextModule textModule)
         {
-            var criteria = CreateCriteriaIsActive<TextModule>();
+            var criteria = CreateCriteria<TextModule>();
 
             criteria.Add(Restrictions.Eq(nameof(TextModule.Parent), textModule));
             
diff --git a/Data/Entities/Textbaustein.cs b/Data/Entities/Textbaustein.cs
index c8c3c3631..e885065d2 100644
--- a/Data/Entities/Textbaustein.cs
+++ b/Data/Entities/Textbaustein.cs
@@ -4,26 +4,26 @@ namespace BeWo.Data.Entities
 {
     public class Textbaustein : BeWoEntityBase
     {
-        public static string PropertyName_Text = "Text";
-        public static string PropertyName_Position = "Position";
-        public static string PropertyName_ServiceCategory = "ServiceCategory";
-        public static string PropertyName_Name = "Name";
-        public static string PropertyName_Employee = "Employee";
+        public static string PropertyName_Text              = "Text";
+        public static string PropertyName_Position          = "Position";
+        public static string PropertyName_ServiceCategory   = "ServiceCategory";
+        public static string PropertyName_Name              = "Name";
+        public static string PropertyName_Employee          = "Employee";
         public static string PropertyName_IsOnlyForEmployee = "IsOnlyForEmployee";
-        public static string PropertyName_ParentOid = "ParentOid";
-        public static string PropertyName_IsParent = "IsParent";
-        public static string PropertyName_IsExpanded = "IsExpanded";
+        public static string PropertyName_ParentOid         = "ParentOid";
+        public static string PropertyName_IsParent          = "IsParent";
+        public static string PropertyName_IsExpanded        = "IsExpanded";
 
 
-        private string _Text;
-        private string _Name;
-        private int _Position;
+        private string          _Text;
+        private string          _Name;
+        private int             _Position;
         private ServiceCategory _ServiceCategory;
-        private Employee _Employee;
-        private bool _IsOnlyForEmployee;
-        private TextModule _Parent;
-        private bool _IsParent;
-        private bool _IsExpanded;
+        private Employee        _Employee;
+        private bool            _IsOnlyForEmployee;
+        private TextModule      _Parent;
+        private bool            _IsParent;
+        private bool            _IsExpanded;
 
 
         public Textbaustein()
diff --git a/Service/DCEntityMapper/TextModuleDC_TextModule.cs b/Service/DCEntityMapper/TextModuleDC_TextModule.cs
index a2f477c3c..fcfc6efbd 100644
--- a/Service/DCEntityMapper/TextModuleDC_TextModule.cs
+++ b/Service/DCEntityMapper/TextModuleDC_TextModule.cs
@@ -17,7 +17,7 @@ namespace BeWo.Service.DCEntityMapper
             pDataContract.IsOnlyForEmployee   = pEntity.IsOnlyForEmployee;
 	        pDataContract.IsParent            = pEntity.IsParent;
 	        pDataContract.IsExpanded          = pEntity.IsExpanded;
-            pDataContract.ActivationType      = pEntity.IsActive;
+            //pDataContract.ActivationType      = pEntity.IsActive;
 
             pDataContract.Parent = pEntity.Parent != null ? MapperFactory.TextModuleDC_TextModule.MapToNewDC(pEntity.Parent) : null;
 
@@ -39,7 +39,7 @@ namespace BeWo.Service.DCEntityMapper
             pEntity.IsOnlyForEmployee = pDataContract.IsOnlyForEmployee;
 	        pEntity.IsParent          = pDataContract.IsParent;
 	        pEntity.IsExpanded        = pDataContract.IsExpanded;
-            pEntity.IsActive          = pDataContract.ActivationType;
+            //pEntity.IsActive          = pDataContract.ActivationType;
 
             pEntity.Parent = pDataContract.Parent != null ? DAOFactory.GenericDAO.LoadByID<TextModule>(pDataContract.Parent.TextModuleOid.Value) : null;
 
diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs
index 81804a01e..61606872d 100644
--- a/Service/ServiceImplementations/OperationsServiceImp.cs
+++ b/Service/ServiceImplementations/OperationsServiceImp.cs
@@ -3119,7 +3119,7 @@ namespace BeWo.Service.ServiceImplementations
         {
             try
             {
-                return MapperFactory.TextModuleDC_TextModule.MapToNewDCs(DAOFactory.GenericDAO.GetAllActive<TextModule>());
+                return MapperFactory.TextModuleDC_TextModule.MapToNewDCs(DAOFactory.GenericDAO.GetAll<TextModule>());
             }
             catch (Exception e)
             {