Added a 3rd level of time filtering #30