Added more filters for exclusion