Added special treatment for tags within the message_args