Re-add generic tag target