diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..239ecff
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+yarn.lock
diff --git a/README.md b/README.md
index 06d5cbb..310ad1f 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ The engine support the following data-attribute (the order isn't casual, is the
 * data-tdal-repeat="repeat-variabile path-expression"
 * data-tdal-content="path-expression-string-allowed" OR
 * data-tdal-replace="path-expression-string-allowed"
-* data-tdal-attribute="attribute path-expression-string-allowed[; attributes path-expression-string-allowed]"
+* data-tdal-attributes="attribute path-expression-string-allowed[; attributes path-expression-string-allowed]"
 * data-tdal-omittag="path-expression-boolean-mod-allowed"
 
 I plan the implement the jTDAL equivalent of the TAL's METAL (partials in mustache) in a future update.
@@ -88,7 +88,7 @@ Replace the tag and its content with the result of the path-expression. Mutually
 If the result of the path expression is "false", the tag and its contents will be removed (like a false data-tdal-condition). If is "true", the default content will be kept.
 
 ### Attribute
-    data-tdal-attribute="href link | STRING:https://www.example.org/{page}; class STRING:link-color-blue"
+    data-tdal-attributes="href link | STRING:https://www.example.org/{page}; class STRING:link-color-blue"
 
 Add an attribute or replace the content of an attribute with the result of the path expression. If the expression value is "true" current attribute content will be kept.
 
diff --git a/jTDAL.js b/jTDAL.js
index 4d68184..0bf8cf4 100644
--- a/jTDAL.js
+++ b/jTDAL.js
@@ -280,14 +280,14 @@ var jTDAL;
                             let tmpValue = ParsePath(tmpTDALrules[2]);
                             if ("false" === tmpValue) {
                                 if ('undefined' !== (typeof attributes[tmpTDALrules[1]])) {
-                                    current[1] = current[1].replace(new RegExp('\\s*' + tmpTDALrules[1] + '(?:=([\'"]).*\\1)?'), '');
+                                    current[1] = current[1].replace(new RegExp('\\s*' + tmpTDALrules[1] + '(?:=([\'"]).*?\\1)?'), '');
                                 }
                             }
                             else if ("true" !== tmpValue) {
                                 current[2] += '+(false!==(t[i]=' + tmpValue + ')&&("string"===typeof t[i]||("number"===typeof t[i]&&!isNaN(t[i])))?" ' + tmpTDALrules[1] +
                                     '=\\""+t[i]+"\\"":(true!==t[i]?"":"';
                                 if ('undefined' !== (typeof attributes[tmpTDALrules[1]])) {
-                                    current[1] = current[1].replace(new RegExp('\\s*' + tmpTDALrules[1] + '(?:=([\'"]).*\\1)?'), '');
+                                    current[1] = current[1].replace(new RegExp('\\s*' + tmpTDALrules[1] + '(?:=([\'"]).*?\\1)?'), '');
                                     current[2] += tmpTDALrules[1] + '"' +
                                         ((('undefined' !== (typeof attributes[tmpTDALrules[1]][3])) && ('' != attributes[tmpTDALrules[1]][3])) ? '+"="+' +
                                             JSON.stringify(String(attributes[tmpTDALrules[1]][2] + attributes[tmpTDALrules[1]][3] +
diff --git a/jTDAL.min.js b/jTDAL.min.js
index 0b7f8ed..b63863e 100644
--- a/jTDAL.min.js
+++ b/jTDAL.min.js
@@ -1 +1 @@
-"use strict";var jTDAL;!function(t){const e="(?:[\\w-\\/]*[\\w](?:[\\s]*\\|[\\s]*[\\w-\\/]*[\\w])*)",i="(STRING:[^;]+|(?:(?:!)?[\\w-\\/]*[\\w](?:[\\s]*\\|[\\s]*[\\w-\\/]*[\\w])*))",r={pathString:new RegExp("^[\\s]*STRING:(.*)$"),tagWithTDAL:new RegExp("<((?:\\w+:)?\\w+)(\\s+[^<>]+?)??\\s+data-tdal-(?:"+["condition","repeat","content","replace","attributes","omittag"].join("|")+")=(['\"])(.*?)\\3(\\s+[^<>]+?)??\\s*(/)?>","i"),tagWithAttribute:new RegExp("<((?:w+:)?w+)(s+[^<>]+?)??s+%s=(['\"])(.*?)\\3(s+[^<>]+?)??s*(/)?>","i"),tagAttributes:new RegExp("(?<=\\s)((?:[\\w-]+:)?[\\w-]+)=(?:(['\"])(.*?)\\2|([^>\\s'\"]+))","gi"),pathInString:new RegExp("{("+e+")}","g"),condition:new RegExp("^[\\s]*(\\!?)[\\s]*"+i+"[\\s]*$"),repeat:new RegExp("^[\\s]*([\\w-]+?)[\\s]+("+e+")[\\s]*$"),content:new RegExp("^[\\s]*(?:(text|structure)[\\s]+)?("+i+")[\\s]*$"),attributes:new RegExp("[\\s]*(?:(?:([\\w-]+?)[\\s]+"+i+"[\\s]*)(?:;[\\s]*|$))","g"),attributesTDAL:new RegExp("\\s*(data-tdal-[\\w-]+)=(?:(['\"])(.*?)\\2|([^>\\s'\"]+))","gi")};function n(t){let e="";switch(t){case"true":case"false":e=t;break;default:e=t.startsWith("!(")?"!"+t:"!("+a(t)+")"}return e}function a(t){let e='"undefined"===typeof (t[i++]='+t+')||false===t[--i]||null===t[i]||(Array.isArray(t[i])&&1>t[i].length)||("object"===typeof t[i]&&1>Object.keys(t[i]).length)';switch(t){case"true":e="false";break;case"false":e="true"}return e}function s(t){let e="",i=0;t:{const n=t.split("|"),l=n.length;for(let t=0;t<l;++t){if(r.pathString.exec(n[t])){let i="",a=n[t].indexOf("STRING:")+7,l=null;for(;null!=(l=r.pathInString.exec(n[t]));)0<i.length&&(i+="+"),0<l.index-a&&(i+=JSON.stringify(String(n[t].substr(a,l.index-a)))+"+"),i+="("+s(l[1])+")",a=l.index+l[0].length;n[t].length>a&&(0<i.length&&(i+="+"),i+=JSON.stringify(String(n[t].substr(a)))),e+="("+i+")";break t}const l=n[t].trim().split("/");let u=0<l.length&&0<l[0].length?"!"!=l[0][0]?l[0]:l[0].substr(1):null;if(u)switch(u){case"FALSE":"!"==l[0][0]?e+="true":e+="false";break t;case"TRUE":"!"==l[0][0]?e+="false":e+="true";break t;case"REPEAT":if(3==l.length){i++,e+="('undefined'!==typeof r['REPEAT']&&",e+="'undefined'!==typeof r['REPEAT']['"+l[1]+"']&&";let t="r['REPEAT']['"+l[1]+"']['"+l[2]+"']";e+="'undefined'!==typeof "+t+"?",e+=("!"==l[0][0]?a(t):t)+":"}break;case"GLOBAL":{const t=l.length;let r="d";i++,e+="(";for(let i=0;i<t;++i)0<i&&(e+="&&"),e+="'undefined'!==typeof "+(r=r+"['"+l[i]+"']");e+="?"+("!"==l[0][0]?a(r):r)+":";break}default:{const t=l.length;let r="r";i++,e+="(";for(let i=0;i<t;++i)0<i&&(e+="&&"),e+="'undefined'!==typeof "+(r=r+"['"+l[i]+"']");e+="?"+("!"==l[0][0]?"("+a(r)+")":r)+":",r="d",i++,e+="(";for(let i=0;i<t;++i)0<i&&(e+="&&"),e+="'undefined'!==typeof "+(r=r+"['"+l[i]+"']");e+="?"+("!"==l[0][0]?a(r):r)+":"}}}e+="false"}for(let t=0;t<i;t++)e+=")";return e}t.Compile=function(t){let e=('let r={"REPEAT":{}},i=0,t=[]; return ""'+function t(e){let i="",a=null;for(;null!==(a=r.tagWithTDAL.exec(e));){0<a.index&&(i+="+"+JSON.stringify(String(e.substr(0,a.index)))),e=e.substr(a.index+a[0].length);let l,u={};for(;null!==(l=r.tagAttributes.exec(a[0]));)u[l[1]]=l;let f=!!a[6],o=[];if(!f){const t=new RegExp("<(\\/)?"+a[1]+"[^<>]*(?<!\\/)>","gi");let i=1;for(;void 0===o[0]&&null!==(l=t.exec(e));)l[1]?i--:i++,0==i&&(o=[l.index,l[0].length])}let d=["",a[0],"","","","","",""];void 0!==o[0]&&(d[4]+=t(e.substr(0,o[0])),d[6]+=e.substr(o[0],o[1]));t:{if(f||void 0!==o[0]){if(void 0!==o[0]&&(e=e.substr(o[0]+o[1])),u["data-tdal-condition"]&&r.condition.exec(u["data-tdal-condition"][3])){let t=n(s(u["data-tdal-condition"][3]));if("false"==t)break t;"true"!=t&&(d[0]+="+(true==="+t+'?""',d[7]=':"")'+d[7])}let t;if(u["data-tdal-repeat"]&&(t=r.repeat.exec(u["data-tdal-repeat"][3]))){let e=s(t[2]);if("false"==e||'""'==e||"true"==e)break t;d[0]+="+(",d[0]+="false!==(t[i]="+e+")&&",d[0]+="(!Array.isArray(t[i])||(t[i]=Object.assign({},t[i])))&&",d[0]+='("object"===typeof t[i]&&0<Object.keys(t[i++]).length)&&(t[i++]=1)',d[0]+="?",d[0]+="Object.keys(t[i-2]).reduce(function(o,e){",d[0]+='r["'+t[1]+'"]=t[i-2][e];',d[0]+='r["REPEAT"]["'+t[1]+'"]={};',d[0]+='r["REPEAT"]["'+t[1]+'"]["index"]=e;',d[0]+='r["REPEAT"]["'+t[1]+'"]["number"]=t[i-1]++;',d[0]+='r["REPEAT"]["'+t[1]+'"]["even"]=0==(r["REPEAT"]["'+t[1]+'"]["number"]%2);',d[0]+='r["REPEAT"]["'+t[1]+'"]["odd"]=1==(r["REPEAT"]["'+t[1]+'"]["number"]%2);',d[0]+='r["REPEAT"]["'+t[1]+'"]["first"]=1==r["REPEAT"]["'+t[1]+'"]["number"];',d[0]+='r["REPEAT"]["'+t[1]+'"]["length"]=Object.keys(t[i-2]);',d[0]+='r["REPEAT"]["'+t[1]+'"]["last"]=r["REPEAT"]["'+t[1]+'"]["length"]==r["REPEAT"]["'+t[1]+'"]["number"];',d[0]+="return o",d[7]=';},""):"")+((i-=2)?"":"")'+d[7]}if(u["data-tdal-content"]&&(t=r.content.exec(u["data-tdal-content"][3]))){let e=s(t[2]);if("false"==e)d[4]="";else if("true"!=e){let i=["",""];"structure"!=t[1]&&(i[0]="(new String(",i[1]=')).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;")'),d[3]+="+(false !== (t[i]="+e+')&&("string"===typeof t[i]||("number"===typeof t[i]&&!isNaN(t[i])))?'+i[0]+"t[i]"+i[1]+':(true!==t[i]?"":""',d[5]+="))"}}else if(u["data-tdal-replace"]&&(t=r.content.exec(u["data-tdal-replace"][3]))){let e=s(t[2]);if("false"==e)d[1]="",d[4]="",d[6]="";else if("true"!=e){let i=["",""];"structure"!=t[1]&&(i[0]="(new String(",i[1]=')).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;")'),d[0]+="+(false!==(t[i]="+e+')&&("string"===typeof t[i]||("number"===typeof t[i]&&!isNaN(t[i])))?'+i[0]+"t[i]"+i[1]+':(true!==t[i]?"":""',d[7]="))"+d[7]}}if(u["data-tdal-attributes"]&&(t=r.attributes.exec(u["data-tdal-attributes"][3])))for(;null!==t;){let e=s(t[2]);"false"===e?void 0!==u[t[1]]&&(d[1]=d[1].replace(new RegExp("\\s*"+t[1]+"(?:=(['\"]).*\\1)?"),"")):"true"!==e&&(d[2]+="+(false!==(t[i]="+e+')&&("string"===typeof t[i]||("number"===typeof t[i]&&!isNaN(t[i])))?" '+t[1]+'=\\""+t[i]+"\\"":(true!==t[i]?"":"',void 0!==u[t[1]]?(d[1]=d[1].replace(new RegExp("\\s*"+t[1]+"(?:=(['\"]).*\\1)?"),""),d[2]+=t[1]+'"'+(void 0!==u[t[1]][3]&&""!=u[t[1]][3]?'+"="+'+JSON.stringify(String(u[t[1]][2]+u[t[1]][3]+u[t[1]][2])):"")):d[2]+='"',d[2]+="))"),t=r.attributes.exec(u["data-tdal-attributes"][3])}if(u["data-tdal-omittag"]&&r.condition.exec(u["data-tdal-omittag"][3])){let t=n(s(u["data-tdal-omittag"][3]));"true"==t?(d[1]="",d[6]=""):"false"!=t&&(d[0]+="+("+t+'?"":""',d[3]=")"+d[3],d[5]+="+("+t+'?"":""',d[7]=")"+d[7])}}for(;null!==(l=r.attributesTDAL.exec(d[1]));)d[1]=d[1].replace(r.attributesTDAL,"")}d[1]=d[1].replace(/\s*\/?>$/,""),!f||void 0!==o[0]||""==d[4]&&""==d[3]&&""==d[5]||(d[6]="</"+a[1]+">",f=!1),i+=d[0]+"+"+JSON.stringify(String(d[1]))+d[2]+(""!=d[1]?'+"'+(f?"/":"")+'>"':"")+d[3]+d[4]+d[5]+"+"+JSON.stringify(String(d[6]))+d[7]}return i+="+"+JSON.stringify(String(e))}(t)).replace(/(?<!\\)""\+/,"").replace(/(?<!\\)"\+"/g,"").replace(/\+""$/,"")+";";return new Function("d",e)}}(jTDAL||(jTDAL={})),"undefined"!=typeof exports&&(exports.Compile=jTDAL.Compile);
\ No newline at end of file
+"use strict";var jTDAL;!function(e){const t="(?:[\\w-\\/]*[\\w](?:[\\s]*\\|[\\s]*[\\w-\\/]*[\\w])*)",r="(STRING:[^;]+|(?:(?:!)?[\\w-\\/]*[\\w](?:[\\s]*\\|[\\s]*[\\w-\\/]*[\\w])*))",i={pathString:new RegExp("^[\\s]*STRING:(.*)$"),tagWithTDAL:new RegExp("<((?:\\w+:)?\\w+)(\\s+[^<>]+?)??\\s+data-tdal-(?:"+["condition","repeat","content","replace","attributes","omittag"].join("|")+")=(['\"])(.*?)\\3(\\s+[^<>]+?)??\\s*(/)?>","i"),tagWithAttribute:new RegExp("<((?:w+:)?w+)(s+[^<>]+?)??s+%s=(['\"])(.*?)\\3(s+[^<>]+?)??s*(/)?>","i"),tagAttributes:new RegExp("(?<=\\s)((?:[\\w-]+:)?[\\w-]+)=(?:(['\"])(.*?)\\2|([^>\\s'\"]+))","gi"),pathInString:new RegExp("{("+t+")}","g"),condition:new RegExp("^[\\s]*(\\!?)[\\s]*"+r+"[\\s]*$"),repeat:new RegExp("^[\\s]*([\\w-]+?)[\\s]+("+t+")[\\s]*$"),content:new RegExp("^[\\s]*(?:(text|structure)[\\s]+)?("+r+")[\\s]*$"),attributes:new RegExp("[\\s]*(?:(?:([\\w-]+?)[\\s]+"+r+"[\\s]*)(?:;[\\s]*|$))","g"),attributesTDAL:new RegExp("\\s*(data-tdal-[\\w-]+)=(?:(['\"])(.*?)\\2|([^>\\s'\"]+))","gi")};function n(e){let t="";switch(e){case"true":case"false":t=e;break;default:t=e.startsWith("!(")?"!"+e:"!("+s(e)+")"}return t}function s(e){let t='"undefined"===typeof (t[i++]='+e+')||false===t[--i]||null===t[i]||(Array.isArray(t[i])&&1>t[i].length)||("object"===typeof t[i]&&1>Object.keys(t[i]).length)';switch(e){case"true":t="false";break;case"false":t="true"}return t}function l(e){let t="",r=0;e:{const n=e.split("|"),f=n.length;for(let e=0;e<f;++e){if(i.pathString.exec(n[e])){let r="",s=n[e].indexOf("STRING:")+7,f=null;for(;null!=(f=i.pathInString.exec(n[e]));)0<r.length&&(r+="+"),0<f.index-s&&(r+=JSON.stringify(String(n[e].substr(s,f.index-s)))+"+"),r+="("+l(f[1])+")",s=f.index+f[0].length;n[e].length>s&&(0<r.length&&(r+="+"),r+=JSON.stringify(String(n[e].substr(s)))),t+="("+r+")";break e}const f=n[e].trim().split("/");let a=0<f.length&&0<f[0].length?"!"!=f[0][0]?f[0]:f[0].substr(1):null;if(a)switch(a){case"FALSE":"!"==f[0][0]?t+="true":t+="false";break e;case"TRUE":"!"==f[0][0]?t+="false":t+="true";break e;case"REPEAT":if(3==f.length){r++,t+="('undefined'!==typeof r['REPEAT']&&",t+="'undefined'!==typeof r['REPEAT']['"+f[1]+"']&&";let e="r['REPEAT']['"+f[1]+"']['"+f[2]+"']";t+="'undefined'!==typeof "+e+"?",t+=("!"==f[0][0]?s(e):e)+":"}break;case"GLOBAL":{const e=f.length;let i="d";r++,t+="(";for(let r=0;r<e;++r)0<r&&(t+="&&"),i=i+"['"+f[r]+"']",t+="'undefined'!==typeof "+i;t+="?"+("!"==f[0][0]?s(i):i)+":";break}default:{const e=f.length;let i="r";r++,t+="(";for(let r=0;r<e;++r)0<r&&(t+="&&"),i=i+"['"+f[r]+"']",t+="'undefined'!==typeof "+i;t+="?"+("!"==f[0][0]?"("+s(i)+")":i)+":",i="d",r++,t+="(";for(let r=0;r<e;++r)0<r&&(t+="&&"),i=i+"['"+f[r]+"']",t+="'undefined'!==typeof "+i;t+="?"+("!"==f[0][0]?s(i):i)+":"}}}t+="false"}for(let e=0;e<r;e++)t+=")";return t}function f(e){let t="",r=null;for(;null!==(r=i.tagWithTDAL.exec(e));){0<r.index&&(t+="+"+JSON.stringify(String(e.substr(0,r.index)))),e=e.substr(r.index+r[0].length);let s,a={};for(;null!==(s=i.tagAttributes.exec(r[0]));)a[s[1]]=s;let u=!!r[6],o=[];if(!u){const t=new RegExp("<(\\/)?"+r[1]+"[^<>]*(?<!\\/)>","gi");let i=1;for(;void 0===o[0]&&null!==(s=t.exec(e));)s[1]?i--:i++,0==i&&(o=[s.index,s[0].length])}let g=["",r[0],"","","","","",""];void 0!==o[0]&&(g[4]+=f(e.substr(0,o[0])),g[6]+=e.substr(o[0],o[1]));e:{if(u||void 0!==o[0]){if(void 0!==o[0]&&(e=e.substr(o[0]+o[1])),a["data-tdal-condition"]&&i.condition.exec(a["data-tdal-condition"][3])){let e=n(l(a["data-tdal-condition"][3]));if("false"==e)break e;"true"!=e&&(g[0]+="+(true==="+e+'?""',g[7]=':"")'+g[7])}let t;if(a["data-tdal-repeat"]&&(t=i.repeat.exec(a["data-tdal-repeat"][3]))){let e=l(t[2]);if("false"==e||'""'==e||"true"==e)break e;g[0]+="+(",g[0]+="false!==(t[i]="+e+")&&",g[0]+="(!Array.isArray(t[i])||(t[i]=Object.assign({},t[i])))&&",g[0]+='("object"===typeof t[i]&&0<Object.keys(t[i++]).length)&&(t[i++]=1)',g[0]+="?",g[0]+="Object.keys(t[i-2]).reduce(function(o,e){",g[0]+='r["'+t[1]+'"]=t[i-2][e];',g[0]+='r["REPEAT"]["'+t[1]+'"]={};',g[0]+='r["REPEAT"]["'+t[1]+'"]["index"]=e;',g[0]+='r["REPEAT"]["'+t[1]+'"]["number"]=t[i-1]++;',g[0]+='r["REPEAT"]["'+t[1]+'"]["even"]=0==(r["REPEAT"]["'+t[1]+'"]["number"]%2);',g[0]+='r["REPEAT"]["'+t[1]+'"]["odd"]=1==(r["REPEAT"]["'+t[1]+'"]["number"]%2);',g[0]+='r["REPEAT"]["'+t[1]+'"]["first"]=1==r["REPEAT"]["'+t[1]+'"]["number"];',g[0]+='r["REPEAT"]["'+t[1]+'"]["length"]=Object.keys(t[i-2]);',g[0]+='r["REPEAT"]["'+t[1]+'"]["last"]=r["REPEAT"]["'+t[1]+'"]["length"]==r["REPEAT"]["'+t[1]+'"]["number"];',g[0]+="return o",g[7]=';},""):"")+((i-=2)?"":"")'+g[7]}if(a["data-tdal-content"]&&(t=i.content.exec(a["data-tdal-content"][3]))){let e=l(t[2]);if("false"==e)g[4]="";else if("true"!=e){let r=["",""];"structure"!=t[1]&&(r[0]="(new String(",r[1]=')).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;")'),g[3]+="+(false !== (t[i]="+e+')&&("string"===typeof t[i]||("number"===typeof t[i]&&!isNaN(t[i])))?'+r[0]+"t[i]"+r[1]+':(true!==t[i]?"":""',g[5]+="))"}}else if(a["data-tdal-replace"]&&(t=i.content.exec(a["data-tdal-replace"][3]))){let e=l(t[2]);if("false"==e)g[1]="",g[4]="",g[6]="";else if("true"!=e){let r=["",""];"structure"!=t[1]&&(r[0]="(new String(",r[1]=')).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;")'),g[0]+="+(false!==(t[i]="+e+')&&("string"===typeof t[i]||("number"===typeof t[i]&&!isNaN(t[i])))?'+r[0]+"t[i]"+r[1]+':(true!==t[i]?"":""',g[7]="))"+g[7]}}if(a["data-tdal-attributes"]&&(t=i.attributes.exec(a["data-tdal-attributes"][3])))for(;null!==t;){let e=l(t[2]);"false"===e?void 0!==a[t[1]]&&(g[1]=g[1].replace(new RegExp("\\s*"+t[1]+"(?:=(['\"]).*?\\1)?"),"")):"true"!==e&&(g[2]+="+(false!==(t[i]="+e+')&&("string"===typeof t[i]||("number"===typeof t[i]&&!isNaN(t[i])))?" '+t[1]+'=\\""+t[i]+"\\"":(true!==t[i]?"":"',void 0!==a[t[1]]?(g[1]=g[1].replace(new RegExp("\\s*"+t[1]+"(?:=(['\"]).*?\\1)?"),""),g[2]+=t[1]+'"'+(void 0!==a[t[1]][3]&&""!=a[t[1]][3]?'+"="+'+JSON.stringify(String(a[t[1]][2]+a[t[1]][3]+a[t[1]][2])):"")):g[2]+='"',g[2]+="))"),t=i.attributes.exec(a["data-tdal-attributes"][3])}if(a["data-tdal-omittag"]&&i.condition.exec(a["data-tdal-omittag"][3])){let e=n(l(a["data-tdal-omittag"][3]));"true"==e?(g[1]="",g[6]=""):"false"!=e&&(g[0]+="+("+e+'?"":""',g[3]=")"+g[3],g[5]+="+("+e+'?"":""',g[7]=")"+g[7])}}for(;null!==(s=i.attributesTDAL.exec(g[1]));)g[1]=g[1].replace(i.attributesTDAL,"")}g[1]=g[1].replace(/\s*\/?>$/,""),!u||void 0!==o[0]||""==g[4]&&""==g[3]&&""==g[5]||(g[6]="</"+r[1]+">",u=!1),t+=g[0]+"+"+JSON.stringify(String(g[1]))+g[2]+(""!=g[1]?'+"'+(u?"/":"")+'>"':"")+g[3]+g[4]+g[5]+"+"+JSON.stringify(String(g[6]))+g[7]}return t+="+"+JSON.stringify(String(e)),t}e.Compile=function(e){let t=('let r={"REPEAT":{}},i=0,t=[]; return ""'+f(e)).replace(/(?<!\\)""\+/,"").replace(/(?<!\\)"\+"/g,"").replace(/\+""$/,"")+";";return new Function("d",t)}}(jTDAL||(jTDAL={})),"undefined"!=typeof exports&&(exports.Compile=jTDAL.Compile);
\ No newline at end of file
diff --git a/jTDAL.ts b/jTDAL.ts
index 9a3e3f4..fe0935c 100644
--- a/jTDAL.ts
+++ b/jTDAL.ts
@@ -301,14 +301,14 @@ namespace jTDAL {
 							let tmpValue = ParsePath( tmpTDALrules[ 2 ] );
 							if( "false" === tmpValue ) {
 								if( 'undefined' !== ( typeof attributes[ tmpTDALrules[ 1 ] ] ) ) {
-									current[ 1 ] = current[ 1 ].replace( new RegExp( '\\s*' + tmpTDALrules[ 1 ] + '(?:=([\'"]).*\\1)?' ), '' );
+									current[ 1 ] = current[ 1 ].replace( new RegExp( '\\s*' + tmpTDALrules[ 1 ] + '(?:=([\'"]).*?\\1)?' ), '' );
 								}
 							}
 							else if( "true" !== tmpValue ) {
 								current[ 2 ] += '+(false!==(t[i]=' + tmpValue + ')&&("string"===typeof t[i]||("number"===typeof t[i]&&!isNaN(t[i])))?" ' + tmpTDALrules[ 1 ] +
 																'=\\""+t[i]+"\\"":(true!==t[i]?"":"';
 								if( 'undefined' !== ( typeof attributes[ tmpTDALrules[ 1 ] ] ) ) {
-									current[ 1 ] = current[ 1 ].replace( new RegExp( '\\s*' + tmpTDALrules[ 1 ] + '(?:=([\'"]).*\\1)?' ), '' );
+									current[ 1 ] = current[ 1 ].replace( new RegExp( '\\s*' + tmpTDALrules[ 1 ] + '(?:=([\'"]).*?\\1)?' ), '' );
 									current[ 2 ] += tmpTDALrules[ 1 ] + '"' +
 																	( ( ( 'undefined' !== ( typeof attributes[ tmpTDALrules[ 1 ] ][ 3 ] ) ) && ( '' != attributes[ tmpTDALrules[ 1 ] ][ 3 ] ) ) ? '+"="+' +
 																	JSON.stringify( String( attributes[ tmpTDALrules[ 1 ] ][ 2 ] + attributes[ tmpTDALrules[ 1 ] ][ 3 ] +
diff --git a/package.json b/package.json
index b43c16f..f46783a 100644
--- a/package.json
+++ b/package.json
@@ -20,10 +20,10 @@
   "homepage": "https://github.com/StefanoBalocco/jTDAL",
   "dependencies": {},
   "scripts": {
-    "build": "node_modules/typescript/bin/tsc && node_modules/uglify-es/bin/uglifyjs jTDAL.js -o jTDAL.min.js -m -c"
+    "build": "node_modules/typescript/bin/tsc && node_modules/terser/bin/terser jTDAL.js -o jTDAL.min.js -m -c --mangle-props regex=/^_/"
   },
   "devDependencies": {
-    "typescript": "4",
-    "uglify-es": "3"
+    "terser": "5",
+    "typescript": "4"
   }
 }