More tagging filters and refactorings