diff --git a/news/405.bugfix b/news/405.bugfix
new file mode 100644
index 000000000..e3c8323d7
--- /dev/null
+++ b/news/405.bugfix
@@ -0,0 +1 @@
+Fix query for when start/end dates are set on collections and refactor event_listing. [ThibautBorn]
diff --git a/plone/app/event/browser/configure.zcml b/plone/app/event/browser/configure.zcml
index ea49f92b7..cf31a1d96 100644
--- a/plone/app/event/browser/configure.zcml
+++ b/plone/app/event/browser/configure.zcml
@@ -23,10 +23,30 @@
menu="plone_displayviews"
title="Event listing"
/>
+
+