TimeFilter and Enumerator bug fix