add support for 'tal:omit-tag' and fix bug passing macro parameters with ampersand