Updated query for different start & end dates

based on Jon Terry's field mapping doc