new filters and bug fixes