changing filter to tag
more tag filter refactoring.