Fixed logic error in TimeFilterHelper and added more options