Change secret_token to env variable
Standardize 'upcoming' date range