diff --git a/COMET.Web.Common.Tests/Components/CardView/CardViewTestFixture.cs b/COMET.Web.Common.Tests/Components/CardView/CardViewTestFixture.cs
index a15c0af5..3ba04fe4 100644
--- a/COMET.Web.Common.Tests/Components/CardView/CardViewTestFixture.cs
+++ b/COMET.Web.Common.Tests/Components/CardView/CardViewTestFixture.cs
@@ -45,6 +45,8 @@ public class CardViewTestFixture
         private TestClass testClass2 = new ();
         private TestClass testClass3 = new ();
         private TestClass[] testClasses;
+        private string[] searchFields = new[] { "Id", "Name" };
+        private string[] sortFields = new[] { string.Empty, "Id", "Name" };
 
         private static RenderFragment<TestClass> NormalTemplate()
         {
@@ -118,8 +120,8 @@ public void VerifyComponent()
                     Assert.That(cardView.Instance.AllowSort, Is.True);
                     Assert.That(cardView.Instance.AllowSearch, Is.True);
                     Assert.That(cardView.Instance.ItemSize, Is.EqualTo(150));
-                    Assert.That(cardView.Instance.SearchFields, Is.EquivalentTo(new [] {"Id", "Name"}));
-                    Assert.That(cardView.Instance.SortFields, Is.EquivalentTo(new[] { string.Empty, "Id", "Name" }));
+                    Assert.That(cardView.Instance.SearchFields, Is.EquivalentTo(this.searchFields));
+                    Assert.That(cardView.Instance.SortFields, Is.EquivalentTo(this.sortFields));
                 });
 
             var textBoxParentComponent = component.Find("#search-textbox");
@@ -297,8 +299,8 @@ public void VerifySelectComponent()
                 Assert.That(cardView.Instance.AllowSort, Is.True);
                 Assert.That(cardView.Instance.AllowSearch, Is.True);
                 Assert.That(cardView.Instance.ItemSize, Is.EqualTo(150));
-                Assert.That(cardView.Instance.SearchFields, Is.EquivalentTo(new[] { "Id", "Name" }));
-                Assert.That(cardView.Instance.SortFields, Is.EquivalentTo(new[] { string.Empty, "Id", "Name" }));
+                Assert.That(cardView.Instance.SearchFields, Is.EquivalentTo(this.searchFields));
+                Assert.That(cardView.Instance.SortFields, Is.EquivalentTo(this.sortFields));
             });
 
             var firstCardField = component.Find(".card");
@@ -330,8 +332,8 @@ public async Task VerifySearchComponent()
                 Assert.That(cardView.Instance.AllowSort, Is.True);
                 Assert.That(cardView.Instance.AllowSearch, Is.True);
                 Assert.That(cardView.Instance.ItemSize, Is.EqualTo(150));
-                Assert.That(cardView.Instance.SearchFields, Is.EquivalentTo(new[] { "Id", "Name" }));
-                Assert.That(cardView.Instance.SortFields, Is.EquivalentTo(new[] { string.Empty, "Id", "Name" }));
+                Assert.That(cardView.Instance.SearchFields, Is.EquivalentTo(this.searchFields));
+                Assert.That(cardView.Instance.SortFields, Is.EquivalentTo(this.sortFields));
             });
 
             var textBoxParentComponent = component.Find("#search-textbox");
@@ -395,8 +397,8 @@ public async Task VerifySortComponent()
                 Assert.That(cardView.Instance.AllowSort, Is.True);
                 Assert.That(cardView.Instance.AllowSearch, Is.True);
                 Assert.That(cardView.Instance.ItemSize, Is.EqualTo(150));
-                Assert.That(cardView.Instance.SearchFields, Is.EquivalentTo(new[] { "Id", "Name" }));
-                Assert.That(cardView.Instance.SortFields, Is.EquivalentTo(new[] { string.Empty, "Id", "Name" }));
+                Assert.That(cardView.Instance.SearchFields, Is.EquivalentTo(this.searchFields));
+                Assert.That(cardView.Instance.SortFields, Is.EquivalentTo(this.sortFields));
                 Assert.That(cardView.Instance.SelectedSortField == string.Empty);
             });
 
diff --git a/COMET.Web.Common/Components/CardView/CardField.cs b/COMET.Web.Common/Components/CardView/CardField.cs
index 48de25d7..68ff33ac 100644
--- a/COMET.Web.Common/Components/CardView/CardField.cs
+++ b/COMET.Web.Common/Components/CardView/CardField.cs
@@ -39,10 +39,10 @@ namespace COMET.Web.Common.Components.CardView
     public class CardField<T> : ComponentBase
     {
         /// <summary>
-        /// The <see cref="TypeAccessor"/> used to read properties from the instance of <see cref="T"/>.
+        /// The <see cref="FastMember.TypeAccessor"/> used to read properties from the instance of T.
         /// This is a static property on a generic type, so it will have different static values for each used generic type in the application
         /// </summary>
-        private static TypeAccessor typeAccessor { get; set; }
+        private static TypeAccessor typeAccessor;
 
         /// <summary>
         /// Initializes the static properties of this <see cref="CardField{T}"/> class
@@ -71,7 +71,7 @@ static CardField()
         public T Context { get; set; }
 
         /// <summary>
-        /// Gets or sets the FieldName (propertyname of <see cref="T"/>) to show in the UI 
+        /// Gets or sets the FieldName (propertyname of T) to show in the UI 
         /// </summary>
         [Parameter]
         public string FieldName { get; set; }
diff --git a/COMET.Web.Common/Components/CardView/CardView.razor b/COMET.Web.Common/Components/CardView/CardView.razor
index 9c73b84f..b941bd4a 100644
--- a/COMET.Web.Common/Components/CardView/CardView.razor
+++ b/COMET.Web.Common/Components/CardView/CardView.razor
@@ -31,7 +31,7 @@
                 </DxTextBox>
             </td>
             <td id="sort-dropdown" style="visibility:@(this.AllowSort ? "block": "hidden");">
-                <DxComboBox TData="string" TValue="string" CssClass="inline-sort-icon" FilteringMode="DataGridFilteringMode.Contains" SizeMode="SizeMode.Medium" Data="@this.SortFields" SelectedItemChanged="@((string x) => this.OnSelectedSortItemChanged(x))"
+                <DxComboBox TData="string" TValue="string" CssClass="inline-sort-icon" FilteringMode="DataGridFilteringMode.Contains" SizeMode="SizeMode.Medium" Data="@this.SortFields" SelectedItemChanged="@( x => this.OnSelectedSortItemChanged(x))"
                     @bind-Value="@this.SelectedSortField">
                 </DxComboBox>
             </td>
@@ -44,10 +44,10 @@
             <ItemContent>
                 <div class="col" style="padding-left:0px;margin-left:0px;height:(@this.ItemSize)px;min-width:(@this.MinWidth)px;">
                     <div class="card @(this.GetSelectedClass(@context))"
-                         @onclick="@(() => this.selectItem(@context))">
+                         @onclick="@(() => this.SelectItem(@context))">
                         <div class="card-body" style="overflow-y:hidden;overflow-x:hidden">
                             <CascadingValue Name="CardView" Value = "this">
-                                <CascadingValue Name="SearchTerm" Value="this.searchTerm">
+                                <CascadingValue Name="SearchTerm" Value="this.SearchTerm">
                                     @this.ItemTemplate(@context)
                                 </CascadingValue>
                             </CascadingValue>
diff --git a/COMET.Web.Common/Components/CardView/CardView.razor.cs b/COMET.Web.Common/Components/CardView/CardView.razor.cs
index 6ad477ac..3c868352 100644
--- a/COMET.Web.Common/Components/CardView/CardView.razor.cs
+++ b/COMET.Web.Common/Components/CardView/CardView.razor.cs
@@ -62,12 +62,12 @@ 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 T to perform search on
         /// </summary>
         public HashSet<string> SearchFields { get; private set; } = [];
 
         /// <summary>
-        /// Gets or sets a collection of propertynames of type <see cref="T"/> to perform sorting on
+        /// Gets or sets a collection of propertynames of type T to perform sorting on
         /// </summary>
         public SortedSet<string> SortFields { get; private set; } = [string.Empty];
 
@@ -93,7 +93,7 @@ public partial class CardView<T> : DisposableComponent
         private Virtualize<T>? virtualize; // Reference to the Virtualize component
 
         /// <summary>
-        /// The FastMember <see cref="TypeAccessor"/> to use to perform actions on instances of <see cref="T"/>
+        /// The FastMember <see cref="FastMember.TypeAccessor"/> to use to perform actions on instances of type T
         /// </summary>
         private TypeAccessor typeAccessor = TypeAccessor.Create(typeof(T));
 
@@ -105,7 +105,7 @@ public partial class CardView<T> : DisposableComponent
         /// <summary>
         /// Gets or sets the term where to search/filter items on
         /// </summary>
-        private string searchTerm { get; set; } = string.Empty;
+        public string SearchTerm { get; set; } = string.Empty;
 
         /// <summary>
         /// Gets or sets the term where to sort items on
@@ -125,23 +125,23 @@ private string GetSelectedClass(T vm)
         /// <summary>
         /// Set the selected item
         /// </summary>
-        /// <param name="item">The item <see cref="T"/></param>
-        private void selectItem(T item)
+        /// <param name="item">The item of type T</param>
+        public void SelectItem(T item)
         {
             this.selected = item;
         }
 
         /// <summary>
-        /// Filters the list of items to show in the UI based on the <see cref="searchTerm"/>
+        /// Filters the list of items to show in the UI based on the <see cref="SearchTerm"/>
         /// </summary>
         /// <param name="request">The request to perform filtering of the items list</param>
         /// <returns>an waitable <see cref="ValueTask"/></returns>
-        private async ValueTask<ItemsProviderResult<T>> LoadItems(ItemsProviderRequest request)
+        private ValueTask<ItemsProviderResult<T>> LoadItems(ItemsProviderRequest request)
         {
             // Filter items based on the SearchTerm
-            var filteredItems = !this.AllowSearch || string.IsNullOrWhiteSpace(this.searchTerm)
+            var filteredItems = !this.AllowSearch || string.IsNullOrWhiteSpace(this.SearchTerm)
                 ? this.Items
-                : this.Items.Where(item => this.FilterItem(item, this.searchTerm)).ToList();
+                : this.Items.Where(item => this.FilterItem(item, this.SearchTerm)).ToList();
 
             // Return paged items for virtualization
             var items = filteredItems.Skip(request.StartIndex).Take(request.Count);
@@ -151,11 +151,11 @@ private async ValueTask<ItemsProviderResult<T>> LoadItems(ItemsProviderRequest r
                 items = items.AsQueryable().OrderBy(this.SelectedSortField);
             }
 
-            return new ItemsProviderResult<T>(items.ToList(), filteredItems.Count);
+            return new ValueTask<ItemsProviderResult<T>>(new ItemsProviderResult<T>(items.ToList(), filteredItems.Count));
         }
 
         /// <summary>
-        /// Used to filter items based on the <see cref="searchTerm"/>
+        /// Used to filter items based on the <see cref="SearchTerm"/>
         /// </summary>
         /// <param name="item">The item to perform searching on</param>
         /// <param name="query">The string to search for</param>
@@ -182,7 +182,7 @@ private bool FilterItem(T item, string query)
         /// <param name="value">The text from the UI element's event</param>
         private void OnSearchTextChanged(string value)
         {
-            this.searchTerm = value ?? string.Empty;
+            this.SearchTerm = value ?? string.Empty;
 
             this.virtualize?.RefreshDataAsync(); // Tell Virtualize to refresh data
         }
diff --git a/COMETwebapp/ViewModels/Components/SystemRepresentation/IElementDefinitionDetailsViewModel.cs b/COMETwebapp/ViewModels/Components/SystemRepresentation/IElementDefinitionDetailsViewModel.cs
index f88364b1..3ed43d4c 100644
--- a/COMETwebapp/ViewModels/Components/SystemRepresentation/IElementDefinitionDetailsViewModel.cs
+++ b/COMETwebapp/ViewModels/Components/SystemRepresentation/IElementDefinitionDetailsViewModel.cs
@@ -40,6 +40,6 @@ public interface IElementDefinitionDetailsViewModel
         /// <summary>
         /// A collection of <see cref="ElementDefinitionDetailsRowViewModel" />
         /// </summary>
-        ICollection<ElementDefinitionDetailsRowViewModel> Rows { get; set; }
+        ICollection<ElementDefinitionDetailsRowViewModel> Rows { get; }
     }
 }