diff --git a/Marechai/Marechai.csproj b/Marechai/Marechai.csproj
index aa7d8346..69199160 100644
--- a/Marechai/Marechai.csproj
+++ b/Marechai/Marechai.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>4.0.0.1618</Version>
+    <Version>4.0.0.1620</Version>
     <Company>Canary Islands Computer Museum</Company>
     <Copyright>Copyright © 2003-2020 Natalia Portillo</Copyright>
     <Product>Canary Islands Computer Museum Website</Product>
diff --git a/Marechai/Pages/Companies/Index.razor.cs b/Marechai/Pages/Companies/Index.razor.cs
index 25128959..5272d60c 100644
--- a/Marechai/Pages/Companies/Index.razor.cs
+++ b/Marechai/Pages/Companies/Index.razor.cs
@@ -34,13 +34,38 @@ namespace Marechai.Pages.Companies
     {
         char?                  _character;
         List<CompanyViewModel> _companies;
+        int?                   _countryId;
         string                 _countryName;
         bool                   _loaded;
-        [Parameter]
-        public int? CountryId { get; set; }
+        string                 _startingCharacter;
 
         [Parameter]
-        public string StartingCharacter { get; set; }
+        public int? CountryId
+        {
+            get => _countryId;
+            set
+            {
+                if(_countryId == value)
+                    return;
+
+                _countryId = value;
+                _loaded    = false;
+            }
+        }
+
+        [Parameter]
+        public string StartingCharacter
+        {
+            get => _startingCharacter;
+            set
+            {
+                if(_startingCharacter == value)
+                    return;
+
+                _startingCharacter = value;
+                _loaded            = false;
+            }
+        }
 
         protected override async Task OnAfterRenderAsync(bool firstRender)
         {
diff --git a/Marechai/Pages/Companies/View.razor.cs b/Marechai/Pages/Companies/View.razor.cs
index a2803b8f..5fd6f344 100644
--- a/Marechai/Pages/Companies/View.razor.cs
+++ b/Marechai/Pages/Companies/View.razor.cs
@@ -40,11 +40,24 @@ namespace Marechai.Pages.Companies
         List<Machine>     _computers;
         List<Machine>     _consoles;
         string            _description;
+        int               _id;
         bool              _loaded;
         List<CompanyLogo> _logos;
         Company           _soldTo;
+
         [Parameter]
-        public int Id { get; set; }
+        public int Id
+        {
+            get => _id;
+            set
+            {
+                if(_id == value)
+                    return;
+
+                _id     = value;
+                _loaded = false;
+            }
+        }
 
         public bool ComputersCollapsed { get; set; } = true;
         public bool ConsolesCollapsed  { get; set; } = true;
diff --git a/Marechai/Pages/Computers/Search.razor.cs b/Marechai/Pages/Computers/Search.razor.cs
index 9057976b..cdeef0be 100644
--- a/Marechai/Pages/Computers/Search.razor.cs
+++ b/Marechai/Pages/Computers/Search.razor.cs
@@ -35,11 +35,36 @@ namespace Marechai.Pages.Computers
         char?                  _character;
         List<MachineViewModel> _computers;
         bool                   _loaded;
-        [Parameter]
-        public int? Year { get; set; }
+        string                 _startingCharacter;
+        int?                   _year;
 
         [Parameter]
-        public string StartingCharacter { get; set; }
+        public int? Year
+        {
+            get => _year;
+            set
+            {
+                if(_year == value)
+                    return;
+
+                _year   = value;
+                _loaded = false;
+            }
+        }
+
+        [Parameter]
+        public string StartingCharacter
+        {
+            get => _startingCharacter;
+            set
+            {
+                if(_startingCharacter == value)
+                    return;
+
+                _startingCharacter = value;
+                _loaded            = false;
+            }
+        }
 
         protected override async Task OnAfterRenderAsync(bool firstRender)
         {
diff --git a/Marechai/Pages/Consoles/Search.razor.cs b/Marechai/Pages/Consoles/Search.razor.cs
index cac1e88e..0689e4d9 100644
--- a/Marechai/Pages/Consoles/Search.razor.cs
+++ b/Marechai/Pages/Consoles/Search.razor.cs
@@ -35,11 +35,36 @@ namespace Marechai.Pages.Consoles
         char?                  _character;
         List<MachineViewModel> _consoles;
         bool                   _loaded;
-        [Parameter]
-        public int? Year { get; set; }
+        string                 _startingCharacter;
+        int?                   _year;
 
         [Parameter]
-        public string StartingCharacter { get; set; }
+        public int? Year
+        {
+            get => _year;
+            set
+            {
+                if(_year == value)
+                    return;
+
+                _year   = value;
+                _loaded = false;
+            }
+        }
+
+        [Parameter]
+        public string StartingCharacter
+        {
+            get => _startingCharacter;
+            set
+            {
+                if(_startingCharacter == value)
+                    return;
+
+                _startingCharacter = value;
+                _loaded            = false;
+            }
+        }
 
         protected override async Task OnAfterRenderAsync(bool firstRender)
         {
diff --git a/Marechai/Pages/Machines/View.razor.cs b/Marechai/Pages/Machines/View.razor.cs
index 66ace7e9..abb423a3 100644
--- a/Marechai/Pages/Machines/View.razor.cs
+++ b/Marechai/Pages/Machines/View.razor.cs
@@ -34,13 +34,26 @@ namespace Marechai.Pages.Machines
     public partial class View
     {
         bool[]           _gpuVisible;
+        int              _id;
         bool             _loaded;
         MachineViewModel _machine;
         List<Guid>       _photos;
         bool[]           _processorVisible;
         bool[]           _soundVisible;
+
         [Parameter]
-        public int Id { get; set; }
+        public int Id
+        {
+            get => _id;
+            set
+            {
+                if(_id == value)
+                    return;
+
+                _id     = value;
+                _loaded = false;
+            }
+        }
 
         protected override async Task OnAfterRenderAsync(bool firstRender)
         {