diff --git a/contract/views/contract.xml b/contract/views/contract.xml
index 957b338e..55a5ff40 100644
--- a/contract/views/contract.xml
+++ b/contract/views/contract.xml
@@ -194,17 +194,17 @@
                 />
                 <separator/>
                 <filter name="not_finished"
-                        string="Valid"
-                        domain="['|', ('date_end', '=', False), ('date_end', '&gt;=', time.strftime('%Y-%m-%d'))]"
+                        string="In progress"
+                        domain="[('recurring_next_date', '&gt;=', time.strftime('%Y-%m-%d'))]"
                 />
                 <filter name="finished"
                         string="Finished"
-                        domain="[('date_end', '&lt;', time.strftime('%Y-%m-%d'))]"
+                        domain="[('date_end', '&lt;', time.strftime('%Y-%m-%d')), ('recurring_next_date', '=', False)]"
                 />
                 <group expand="0" string="Group By...">
                     <filter name="next_invoice"
                             string="Next Invoice"
-                            domain="[]"
+                            domain="[('recurring_next_date', '&gt;=', time.strftime('%Y-%m-%d'))]"
                             context="{'group_by':'recurring_next_date'}"
                     />
                     <filter name="date_end"