Add filters
Minor fix