diff --git a/COMET.Web.Common/Components/CardView/CardField.cs b/COMET.Web.Common/Components/CardView/CardField.cs
index 24238f25..f2cba9f6 100644
--- a/COMET.Web.Common/Components/CardView/CardField.cs
+++ b/COMET.Web.Common/Components/CardView/CardField.cs
@@ -138,4 +138,4 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/COMET.Web.Common/Components/CardView/CardView.razor b/COMET.Web.Common/Components/CardView/CardView.razor
index 4f86e930..19b98b0c 100644
--- a/COMET.Web.Common/Components/CardView/CardView.razor
+++ b/COMET.Web.Common/Components/CardView/CardView.razor
@@ -19,7 +19,7 @@
 //   See the License for the specific language governing permissions and
 //   limitations under the License.
 ------------------------------------------------------------------------------->
-@namespace COMET.Web.Common.Components
+@namespace COMET.Web.Common.Components.CardView
 @typeparam T
 @inherits DisposableComponent
 
diff --git a/COMET.Web.Common/Components/CardView/CardView.razor.cs b/COMET.Web.Common/Components/CardView/CardView.razor.cs
index 07010003..c249d5b4 100644
--- a/COMET.Web.Common/Components/CardView/CardView.razor.cs
+++ b/COMET.Web.Common/Components/CardView/CardView.razor.cs
@@ -23,17 +23,15 @@
 //  </copyright>
 //  --------------------------------------------------------------------------------------------------------------------
 
-namespace COMET.Web.Common.Components
+namespace COMET.Web.Common.Components.CardView
 {
-    using COMET.Web.Common.Components.CardView;
+    using System.Linq.Dynamic.Core;
 
     using FastMember;
 
     using Microsoft.AspNetCore.Components;
     using Microsoft.AspNetCore.Components.Web.Virtualization;
 
-    using System.Linq.Dynamic.Core;
-
     /// <summary>
     /// Component used to show a CardView based on a specific type
     /// </summary>
@@ -64,30 +62,30 @@ public partial class CardView<T> : DisposableComponent
         public float MinWidth { get; set; } = 250;
 
         /// <summary>
-        /// Gets or sets a collection of propertynames of type <see cref="T"/> to perform search on
+        /// Gets or sets a collection of propertynames of type <see cref="T"/>to perform search on
         /// </summary>
-        public HashSet<string> SearchFields { get; set; } = [];
+        public HashSet<string> SearchFields { get; private set; } = [];
 
         /// <summary>
         /// Gets or sets a collection of propertynames of type <see cref="T"/> to perform sorting on
         /// </summary>
-        public SortedSet<string> SortFields { get; set; } = [string.Empty];
+        public SortedSet<string> SortFields { get; private set; } = [string.Empty];
 
         /// <summary>
         /// Gets or sets a value indication that sorting is allowed
         /// </summary>
-        public bool AllowSort { get; set; } = false;
+        public bool AllowSort { get; set; }
 
         /// <summary>
         /// Gets or sets a value indication that searching is allowed
         /// </summary>
-        public bool AllowSearch { get; set; } = false;
+        public bool AllowSearch { get; set; }
 
         /// <summary>
         /// hold a reference to the previously selected Item.
         /// Typically used to check for changes in Items collection
         /// </summary>
-        private ICollection<T> previousItems = null;
+        private ICollection<T> previousItems;
 
         /// <summary>
         /// A reference to the <see cref="Virtualize{T}"/> component for loading items
@@ -219,22 +217,16 @@ private void OnSearchTextChanged(string value)
         /// <param name="cardField">the <see cref="CardField{T}"/></param>
         internal void InitializeCardField(CardField<T> cardField)
         {
-            if (cardField.AllowSort)
+            if (cardField.AllowSort && this.SortFields.Add(cardField.FieldName))
             {
-                if (this.SortFields.Add(cardField.FieldName))
-                {
-                    this.AllowSort = true;
-                    this.StateHasChanged();
-                }
+                this.AllowSort = true;
+                this.StateHasChanged();
             }
 
-            if (cardField.AllowSearch)
+            if (cardField.AllowSearch && this.SearchFields.Add(cardField.FieldName))
             {
-                if (this.SearchFields.Add(cardField.FieldName))
-                {
-                    this.AllowSearch = true;
-                    this.StateHasChanged();
-                }
+                this.AllowSearch = true;
+                this.StateHasChanged();
             }
         }