LPS-50596 Fixing date range handling