diff --git a/src/SolRIA.SaftAnalyser/ViewModels/SaftCustomersViewModel.cs b/src/SolRIA.SaftAnalyser/ViewModels/SaftCustomersViewModel.cs
index 5c8b1ec..6572733 100644
--- a/src/SolRIA.SaftAnalyser/ViewModels/SaftCustomersViewModel.cs
+++ b/src/SolRIA.SaftAnalyser/ViewModels/SaftCustomersViewModel.cs
@@ -45,7 +45,7 @@ public Customer[] Customers
 		public string Filter
 		{
 			get { return filter; }
-			set { SetProperty(ref filter, value); }
+			set { SetProperty(ref filter, value, FilterCustomers); }
 		}
 
 		//SearchCommand
diff --git a/src/SolRIA.SaftAnalyser/ViewModels/SaftProductsViewModel.cs b/src/SolRIA.SaftAnalyser/ViewModels/SaftProductsViewModel.cs
index 40d87e2..bbd84ec 100644
--- a/src/SolRIA.SaftAnalyser/ViewModels/SaftProductsViewModel.cs
+++ b/src/SolRIA.SaftAnalyser/ViewModels/SaftProductsViewModel.cs
@@ -53,23 +53,23 @@ public Product Product
         string filter;
         public string Filter
         {
-            get { return filter; }
-            set
-            {
-                SetProperty(ref filter, value);
+            get => filter;
+            set => SetProperty(ref filter, value, FilterProducts);
+        }
 
-                if (string.IsNullOrEmpty(filter))
-                    Products = productsBack;
-                else
-                {
-                    Products = (from c in productsBack
-                                where !string.IsNullOrEmpty(c.ProductCode) && c.ProductCode.IndexOf(filter, System.StringComparison.OrdinalIgnoreCase) >= 0 ||
-                                !string.IsNullOrEmpty(c.ProductDescription) && c.ProductDescription.IndexOf(filter, System.StringComparison.OrdinalIgnoreCase) >= 0 ||
-                                !string.IsNullOrEmpty(c.ProductGroup) && c.ProductGroup.IndexOf(filter, System.StringComparison.OrdinalIgnoreCase) >= 0 ||
-                                !string.IsNullOrEmpty(c.ProductNumberCode) && c.ProductNumberCode.IndexOf(filter, System.StringComparison.OrdinalIgnoreCase) >= 0 ||
-                                c.ProductType.ToString().IndexOf(filter, System.StringComparison.OrdinalIgnoreCase) >= 0
-                                select c).ToArray();
-                }
+        private void FilterProducts()
+        {
+            if (string.IsNullOrEmpty(filter))
+                Products = productsBack;
+            else
+            {
+                Products = (from c in productsBack
+                            where !string.IsNullOrEmpty(c.ProductCode) && c.ProductCode.IndexOf(filter, System.StringComparison.OrdinalIgnoreCase) >= 0 ||
+                            !string.IsNullOrEmpty(c.ProductDescription) && c.ProductDescription.IndexOf(filter, System.StringComparison.OrdinalIgnoreCase) >= 0 ||
+                            !string.IsNullOrEmpty(c.ProductGroup) && c.ProductGroup.IndexOf(filter, System.StringComparison.OrdinalIgnoreCase) >= 0 ||
+                            !string.IsNullOrEmpty(c.ProductNumberCode) && c.ProductNumberCode.IndexOf(filter, System.StringComparison.OrdinalIgnoreCase) >= 0 ||
+                            c.ProductType.ToString().IndexOf(filter, System.StringComparison.OrdinalIgnoreCase) >= 0
+                            select c).ToArray();
             }
         }