diff --git a/ferramentas/etiqueta/exec.php b/ferramentas/etiqueta/exec.php
index 0310473..843683e 100755
--- a/ferramentas/etiqueta/exec.php
+++ b/ferramentas/etiqueta/exec.php
@@ -21,8 +21,6 @@ Ativa as etiquetas de um tema.
 		$m->layer->setmetadata("IDENTIFICA","");
 		$m->layer->setmetadata("TIP",$_GET["tips"]);
 		$m->layer->setmetadata("ITENS",$_GET["itens"]);
-		//$m->layer->setmetadata("ITENSDESC",base64_decode($itensdesc));
-		//$m->layer->setmetadata("ITENSLINK",base64_decode($itenslink));
 		$m->layer->setmetadata("ITENSDESC",$_GET["itensdesc"]);
 		$m->layer->setmetadata("ITENSLINK",$_GET["itenslink"]);
 		$m->layer->setmetadata("itembuscarapida",$_GET["itembuscarapida"]);
diff --git a/ferramentas/etiqueta/index.js b/ferramentas/etiqueta/index.js
index 71879e2..cb41328 100755
--- a/ferramentas/etiqueta/index.js
+++ b/ferramentas/etiqueta/index.js
@@ -291,23 +291,19 @@ i3GEOF.etiqueta = {
 			i,
 			it,
 			n = inputs.length;
-		for (i=0;i<n; i++){
-			it = inputs[i];
-			if (it.checked === true && it.name === "etiquetaTip"){
-				tips.push(it.value);
-			}
-			if (it.checked === true && it.name === "identifica"){
-				itens.push(it.value);
-			}
-			if (it.name === "itensdesc"){
-				itensdesc.push(it.value);
-			}
-			if (it.name === "itenslink"){
-				itenslink.push(it.value);
-			}
-			if (it.name === "itembuscarapida" && it.checked === true){
-				itembuscarapida = it.value;
+		for (i=0;i<n; i=i+5){
+			if (inputs[i].checked === true){
+				itens.push(inputs[i].value);
+				if (inputs[i+1].checked === true){
+					tips.push(inputs[i+1].value);
+				}
+				if (inputs[i+2].checked){
+					itembuscarapida = inputs[i+2].value;
+				}
+				itensdesc.push(inputs[i+3].value);
+				itenslink.push(inputs[i+4].value);
 			}
+
 		}
 		return([tips,itens,itensdesc,itenslink,itembuscarapida]);
 	},
diff --git a/ferramentas/etiqueta/templateLista_mst.html b/ferramentas/etiqueta/templateLista_mst.html
index 4edbffe..d59e73f 100755
--- a/ferramentas/etiqueta/templateLista_mst.html
+++ b/ferramentas/etiqueta/templateLista_mst.html
@@ -2,11 +2,11 @@
 	<table>
 		<tr>
 			<td>Coluna</td>
-			<td>Identifica</td>
-			<td>Tip</td>
-			<td>Busca</td>
-			<td>Alias</td>
-			<td style="margin-left:10px;">Link</td>
+			<td style="text-align:center">Identifica</td>
+			<td style="text-align:center">Tip</td>
+			<td style="text-align:center">Busca</td>
+			<td style="text-align:center">Alias</td>
+			<td style="text-align:center;">Link</td>
 		<tr>{{#linhas}}
 		<tr>
 			<td>{{{item}}}</td>
--
libgit2 0.21.2