improve hour calculation
Introduce validation for timespan selector