diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index f13d41c9c31..f40d87d1739 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -36,8 +36,6 @@ import urllib
 
 
 class website_event(http.Controller):
-    _order = 'website_published desc, date_begin desc'
-
     @website.route(['/event/', '/event/page/<int:page>/'], type='http', auth="public", multilang=True)
     def events(self, page=1, **searches):
         cr, uid, context = request.cr, request.uid, request.context
@@ -51,30 +49,35 @@ class website_event(http.Controller):
 
         domain_search = {}
 
+        def sdn(date):
+            return date.strftime('%Y-%m-%d 23:59:59')
         def sd(date):
             return date.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
         today = datetime.today()
         dates = [
-            ['all', _('All Dates'), [(1, "=", 1)], 0],
+            ['all', _('Next Events'), [("date_end", ">", sd(today))], 0],
             ['today', _('Today'), [
-                ("date_begin", ">", sd(today)),
-                ("date_begin", "<", sd(today + relativedelta(days=1)))],
-                0],
-            ['tomorrow', _('Tomorrow'), [
-                ("date_begin", ">", sd(today + relativedelta(days=1))),
-                ("date_begin", "<", sd(today + relativedelta(days=2)))],
+                ("date_end", ">", sd(today)),
+                ("date_begin", "<", sdn(today))],
                 0],
             ['week', _('This Week'), [
-                ("date_begin", ">=", sd(today + relativedelta(days=-today.weekday()))),
-                ("date_begin", "<", sd(today  + relativedelta(days=6-today.weekday())))],
+                ("date_end", ">=", sd(today + relativedelta(days=-today.weekday()))),
+                ("date_begin", "<", sdn(today  + relativedelta(days=6-today.weekday())))],
                 0],
             ['nextweek', _('Next Week'), [
-                ("date_begin", ">=", sd(today + relativedelta(days=7-today.weekday()))),
-                ("date_begin", "<", sd(today  + relativedelta(days=13-today.weekday())))],
+                ("date_end", ">=", sd(today + relativedelta(days=7-today.weekday()))),
+                ("date_begin", "<", sdn(today  + relativedelta(days=13-today.weekday())))],
                 0],
             ['month', _('This month'), [
-                ("date_begin", ">=", sd(today.replace(day=1) + relativedelta(months=1))),
-                ("date_begin", "<", sd(today.replace(day=1)  + relativedelta(months=1)))],
+                ("date_end", ">=", sd(today.replace(day=1))),
+                ("date_begin", "<", (today.replace(day=1) + relativedelta(months=1)).strftime('%Y-%m-%d 00:00:00'))],
+                0],
+            ['nextmonth', _('Next month'), [
+                ("date_end", ">=", sd(today.replace(day=1) + relativedelta(months=1))),
+                ("date_begin", "<", (today.replace(day=1)  + relativedelta(months=2)).strftime('%Y-%m-%d 00:00:00'))],
+                0],
+            ['old', _('Old Events'), [
+                ("date_end", "<", today.strftime('%Y-%m-%d 00:00:00'))],
                 0],
         ]
 
@@ -103,9 +106,10 @@ class website_event(http.Controller):
 
         # count by domains without self search
         for date in dates:
-            date[3] = event_obj.search(
-                request.cr, request.uid, dom_without('date') + date[2],
-                count=True, context=request.context)
+            if date[0] <> 'old':
+                date[3] = event_obj.search(
+                    request.cr, request.uid, dom_without('date') + date[2],
+                    count=True, context=request.context)
 
         domain = dom_without('type')
         types = event_obj.read_group(
@@ -134,9 +138,13 @@ class website_event(http.Controller):
             request.cr, request.uid, dom_without("none"), count=True,
             context=request.context)
         pager = request.website.pager(url="/event/", total=event_count, page=page, step=step, scope=5)
+
+        order = 'website_published desc, date_begin'
+        if searches.get('date','all') == 'old':
+            order = 'website_published desc, date_begin desc'
         obj_ids = event_obj.search(
             request.cr, request.uid, dom_without("none"), limit=step,
-            offset=pager['offset'], order=self._order, context=request.context)
+            offset=pager['offset'], order=order, context=request.context)
         events_ids = event_obj.browse(request.cr, request.uid, obj_ids,
                                       context=request.context)
 
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 7a0fe19cafb..91488d2e597 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -28,7 +28,7 @@
                     <div class="col-md-3 col-sm-4 css_noprint" id="left_column">
                         <ul class="nav nav-pills nav-stacked">
                             <t t-foreach="dates" t-as="date">
-                                <li t-att-class="searches.get('date') == date[0] and 'active' or ''" t-if="date[3]">
+                                <li t-att-class="searches.get('date') == date[0] and 'active' or ''" t-if="date[3] or (date[0]=='old')">
                                     <a t-href="/event/#{ search_path }&amp;date=#{ date[0] }"><t t-esc="date[1]"/>
                                         <span t-if="date[3]" class="badge pull-right"><t t-esc="date[3]"/></span>
                                     </a>