added filters
cleanup