Filter by should use 'Upcoming' by default

Filter by should use 'Upcoming' by default but that is configurable via a variable.

#2015