daterange-fixes