bug fixes with filters