Improve filtering with active tags