feat(tagging): add tagging to filter

#43
Merge remote-tracking branch 'origin/master'