Added capture filtering