Modified current_and_upcoming scope