[Review]: Updates to TimeRange (to fix Issue #1094)

Timerange fix
so in fact this whole section can go away.