Added filters for time and type