Generic filter bug fix