Added this_week date range setup for #532