New filters & bug fix.