CallbackFilter forever active fix + tests fix