Added more filtering functionality