diff --git a/src/iRLeagueManager.Web/Components/MultiSelectAutoComplete.razor b/src/iRLeagueManager.Web/Components/MultiSelectAutoComplete.razor
index a46fcbc2..a2c57a54 100644
--- a/src/iRLeagueManager.Web/Components/MultiSelectAutoComplete.razor
+++ b/src/iRLeagueManager.Web/Components/MultiSelectAutoComplete.razor
@@ -19,7 +19,8 @@
                      ErrorText="@ErrorText"
                      @attributes="AdditionalAttributes"
                      @ref=Autocomplete
-                     NoItemsTemplate="NoItemsTemplate" />
+                     NoItemsTemplate="NoItemsTemplate" 
+                     MaxItems="MaxItems" />
     <MudChipSet Class="mt-1" AllClosable=true OnClose="RemoveValue">
         @foreach (var val in selectedValues)
         {
@@ -74,6 +75,9 @@
     [Parameter]
     public RenderFragment? NoItemsTemplate { get; set; }
 
+    [Parameter]
+    public int MaxItems { get; set; } = 100;
+
     private HashSet<T> selectedValues = new HashSet<T>();
 
     private MudAutocomplete<T> Autocomplete { get; set; } = default!;
diff --git a/src/iRLeagueManager.Web/Components/Settings/EditTeamDialog.razor b/src/iRLeagueManager.Web/Components/Settings/EditTeamDialog.razor
index 7910f1d8..76ec8275 100644
--- a/src/iRLeagueManager.Web/Components/Settings/EditTeamDialog.razor
+++ b/src/iRLeagueManager.Web/Components/Settings/EditTeamDialog.razor
@@ -23,7 +23,8 @@
                                          @bind-Values=Vm.Members
                                          SearchFunc="SearchMembers"
                                          ToStringFunc="@(member => member is null ? string.Empty : $"{member.FirstName} {member.LastName}")"
-                                         Variant="Variant.Outlined" />
+                                         Variant="Variant.Outlined" 
+                                         MaxItems="1000"/>
                 <FormValidationMessage TValue=string Message=@ResultValidator?.ErrorMessage />
             </MudStack>
         </EditForm>
@@ -49,7 +50,7 @@
         }
     }
 
-    private async Task<IEnumerable<MemberInfoModel>> SearchMembers(string searchString)
+    private async Task<IEnumerable<MemberInfoModel>> SearchMembers(string? searchString)
     {
         if (string.IsNullOrEmpty(searchString))
         {
diff --git a/src/iRLeagueManager.Web/Components/Settings/ScoringSettings.razor b/src/iRLeagueManager.Web/Components/Settings/ScoringSettings.razor
index 20118f3f..43d7b1b5 100644
--- a/src/iRLeagueManager.Web/Components/Settings/ScoringSettings.razor
+++ b/src/iRLeagueManager.Web/Components/Settings/ScoringSettings.razor
@@ -72,7 +72,12 @@
     private PointRuleModel PointRuleModel
     {
         get => Scoring.PointRule.GetModel();
-        set => Scoring.PointRule.SetModel(value, changed: true);
+        set 
+        {
+            var scoringModel = Scoring.GetModel();
+            scoringModel.PointRule = value;
+            Scoring.SetModel(scoringModel, changed: true);
+        }
     }
 
     protected override void OnParametersSet()
diff --git a/src/iRLeagueManager.Web/iRLeagueManager.Web.csproj b/src/iRLeagueManager.Web/iRLeagueManager.Web.csproj
index 0311166c..1273eba6 100644
--- a/src/iRLeagueManager.Web/iRLeagueManager.Web.csproj
+++ b/src/iRLeagueManager.Web/iRLeagueManager.Web.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-	<Version>0.11.4</Version>
+	<Version>0.11.5</Version>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-iRLeagueManager.Web-2B05F9DC-55A3-49D1-BD64-31507000EDF3</UserSecretsId>