improved filters
bug fixes