Created by: Mogge
Do not only filter for the event start date, but for the event end date as well.
based on #6391