diff --git a/inc/tpl/config.php b/inc/tpl/config.php
index 7c880203..23784167 100644
--- a/inc/tpl/config.php
+++ b/inc/tpl/config.php
@@ -217,18 +217,6 @@ $allowedExts = SP_Config::getValue('allowed_exts');
         </td>
         <td class="valField">
             <input type="text" name="wikifilter" id="wikifilter" value="<? echo SP_Config::getValue('wikifilter'); ?>" />
-            <!--<select id="wikifilter" name="wikifilter[]" MULTIPLE="multiple" size="3">-->
-            <? 
-//            if ( SP_Config::getValue('wikifilter') ){
-//                $wikifilter = explode("||", SP_Config::getValue('wikifilter'));
-//                sort($wikifilter, SORT_STRING);
-//
-//                foreach ( $wikifilter as $filter ){
-//                    echo '<OPTION value="'.$filter.'">'.$filter.'</OPTION>';
-//                }
-//            }
-            ?>
-            </select>
         </td>
     </tr>
 </table>
@@ -391,8 +379,19 @@ $allowedExts = SP_Config::getValue('allowed_exts');
             // Fix scrolling to bottom
             var $tagsbox = $(this).next();
             $tagsbox.animate({scrollTop: $tagsbox.height()});
+            
+            if ( $tagsbox.find('img:last').attr('alt') != 'warning' ){
+                $tagsbox.find('div:last').prev().append('<img src="imgs/warning.png" alt="warning" class="iconMini" title="' + LANG[13] + '" />');
+            }
         },
-        'onRemoveTag' : function(){
+        'onRemoveTag' : function(){           
+            var $tagsbox = $(this).next();
+            
+            if ( $tagsbox.find('img:last').attr('alt') != 'warning' ){
+                $tagsbox.find('div:last').prev().append('<img src="imgs/warning.png" alt="warning" class="iconMini" title="' + LANG[13] + '"/>');
+            }
+        },
+        onChange : function(){
             // Fix tooltip on refresh the tags list
             $(this + '[title]').powerTip(powertipOptions);
         }
@@ -407,15 +406,25 @@ $allowedExts = SP_Config::getValue('allowed_exts');
             // Fix scrolling to bottom
             var $tagsbox = $(this).next();
             $tagsbox.animate({scrollTop: $tagsbox.height()});
+            
+            if ( $tagsbox.find('img:last').attr('alt') != 'warning' ){
+                $tagsbox.find('div:last').prev().append('<img src="imgs/warning.png" alt="warning" class="iconMini" title="' + LANG[13] + '"/>');
+            }
         },
         onRemoveTag : function(){
-            // Fix tooltip on refresh the tags list
-            $(this + '[title]').powerTip(powertipOptions);
+            var $tagsbox = $(this).next();
+            
+            if ( $tagsbox.find('img:last').attr('alt') != 'warning' ){
+                $tagsbox.find('div:last').prev().append('<img src="imgs/warning.png" alt="warning" class="iconMini" title="' + LANG[13] + '"/>');
+            }
         },
         onChange : function(){
             var $tagsbox = $(this).next();
             last_width = $tagsbox.find("span:last").width() + 10;
-            $tagsbox.find(".tag:last").css('width', last_width); 
+            $tagsbox.find(".tag:last").css('width', last_width);
+            
+            // Fix tooltip on refresh the tags list
+            $(this + '[title]').powerTip(powertipOptions);
         }
     });
 </script>
\ No newline at end of file
diff --git a/js/functions.php b/js/functions.php
index df7c760b..5c9ad885 100644
--- a/js/functions.php
+++ b/js/functions.php
@@ -48,8 +48,7 @@ $locale= array(
                     'Valor no introducido',
                     'Valor duplicado',
                     'Opción no seleccionada',
-                    'Opción añadida<br>Guarde la configuración para que sea efectiva',
-                    'Opción eliminada<br>Guarde la configuración para que sea efectiva',
+                    'Guarde la configuración para que sea efectiva',
                     'Clave Generada',
                     'Nivel alto',
                     'Nivel medio',
@@ -78,8 +77,7 @@ $locale= array(
                     'Value not entered',
                     'Duplicated value',
                     'Option not selected',
-                    'Option added<br>You should save configuration in order to take effect',
-                    'Option deleted<br>You should save configuration in order to take effect',
+                    'You should save configuration in order to take effect',
                     'Generated Password',
                     'High level',
                     'Average level',