better macro support for tags