fixed issue with from and until entries in TimeMaps found by Harish