Fix crash and handle current day with multiple week requests