Fix #1416 - create a tag filter directive