#5 Added support for 'upcomming' in the backend.