Add tag filtering support