Fixed for updated page layout and date range