filter and bug fix