Fix tag and argument triggers